mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
64 lines
1.8 KiB
Diff
64 lines
1.8 KiB
Diff
From c262cb09fa9f4dad056ba5b25a8627408bcf909a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Sun, 14 Apr 2013 20:41:41 +0200
|
|
Subject: [PATCH] Fix handling absolute paths in single file key output.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Michał Górny <mgorny@gentoo.org>
|
|
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=464954
|
|
---
|
|
intltool-merge.in | 17 ++++++++++++-----
|
|
1 file changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/intltool-merge.in b/intltool-merge.in
|
|
index 1afa2a4..47dbbdf 100644
|
|
--- a/intltool-merge.in
|
|
+++ b/intltool-merge.in
|
|
@@ -1108,13 +1108,20 @@ sub keys_merge_translation
|
|
{
|
|
my ($lang) = @_;
|
|
|
|
- if ( ! -d $lang && $MULTIPLE_OUTPUT)
|
|
+ my $outpath = "$OUTFILE";
|
|
+
|
|
+ if ($MULTIPLE_OUTPUT)
|
|
{
|
|
- mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
|
|
+ $outpath = "$lang/$outpath";
|
|
+
|
|
+ if ( ! -d $lang )
|
|
+ {
|
|
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
|
|
+ }
|
|
}
|
|
|
|
open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
|
|
- open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
|
|
+ open OUTPUT, ">$outpath" or die "Cannot open $outpath: $!\n";
|
|
binmode (OUTPUT) if $^O eq 'MSWin32';
|
|
|
|
while (<INPUT>)
|
|
@@ -1159,7 +1166,7 @@ sub keys_merge_translation
|
|
close OUTPUT;
|
|
close INPUT;
|
|
|
|
- print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
|
|
+ print "CREATED $outpath\n" unless $QUIET_ARG;
|
|
}
|
|
|
|
sub keys_merge_translations
|
|
@@ -1174,7 +1181,7 @@ sub keys_merge_translations
|
|
}
|
|
else
|
|
{
|
|
- keys_merge_translation (".");
|
|
+ keys_merge_translation ();
|
|
}
|
|
}
|
|
|
|
--
|
|
1.8.1.5
|
|
|