tags 415192 patch
thanks
Hello,
Attached is a patch that should make svn-buildpackage unsensitive to
locale. It should apply cleanly over svn-buildpackage 0.6.22 (from
experimental[*]).
Would you, please, test the patch and report back if there are anymore
issues related to this problem?
I will apply this patch to svn-buildpackage's trunk anyway when I have
the time (I just need to remember to add a changelog entry about this
patch, too).
Thanks in advance.
[*] If you feel uneasy about trying the experimental version, you
shouldn't be in this case; svn-buildpackage 0.6.22 should actually be
less buggy than any other previous version
--
Regards,
EddyP
=============================================
"Imagination is more important than knowledge" A.Einstein
Index: svn-buildpackage
===================================================================
--- svn-buildpackage (revision 5646)
+++ svn-buildpackage (working copy)
@@ -515,7 +515,7 @@
my $dirname="$package-$upVersion";
needs_upsCurrentUrl;
- if(`svn status $$c{"trunkDir"}` =~ /(^|\n)(A|M|D)/m) {
+ if(`env LC_ALL=C svn status $$c{"trunkDir"}` =~ /(^|\n)(A|M|D)/m) {
print STDERR "Warning, uncommited changes found, using combinediff to merge them...\n";
chomp($afile=`mktemp`);
chomp($bfile=`mktemp`);
Index: SDCommon.pm
===================================================================
--- SDCommon.pm (revision 5646)
+++ SDCommon.pm (working copy)
@@ -123,12 +123,12 @@
my $svnout;
my $svntempdir;
- chomp ( $svnout = `svn info $tempurl 2>/dev/null`) ;
+ chomp ( $svnout = `env LC_ALL=C svn info $tempurl 2>/dev/null`) ;
while ( ( $svnout =~ /^$/ ) and ( "$tempurl" =~ /^(svn(\+ssh)?|file|https?):\/\/.*/ ) ) {
chomp ( $part= `basename $tempurl` ) ;
$missingurl = $part . '/' . $missingurl ;
chomp ( $tempurl = `dirname $tempurl` ) ;
- chomp ( $svnout = `svn info $tempurl 2>/dev/null`) ;
+ chomp ( $svnout = `env LC_ALL=C svn info $tempurl 2>/dev/null`) ;
} ;
# now we have to import $missingurl at $tempurl level
@@ -166,7 +166,7 @@
my $PATH;
my $testpath=long_path($_[0]);
return $cacheUrl{$testpath} if($cacheUrl{$testpath});
- open(INFO, "svn info $testpath 2>/dev/null |");
+ open(INFO, "env LC_ALL=C svn info $testpath 2>/dev/null |");
while(<INFO>) {
$URL=$1 if(/^Url\s*:\W*(.+)\n/i);
$PATH=$1 if(/^Path\s*:\s*(.+)\n/i);
@@ -196,7 +196,7 @@
return undef if !defined $testurl;
return $inSvn{$testurl} if $inSvn{$testurl};
print "Repository lookup, probing $url...\n";
- open(INFO, "svn ls $url 2>/dev/null |") or
+ open(INFO, "env LC_ALL=C svn ls $url 2>/dev/null |") or
die ("Can't open svn ls $url: $!");
@junk=<INFO>;
if (close INFO) {
@@ -312,7 +312,7 @@
sub init {
- open(INFOC, "svn info debian/changelog |"); @junk=<INFOC>;
+ open(INFOC, "env LC_ALL=C svn info debian/changelog |"); @junk=<INFOC>;
if(!close(INFOC)) {
exwerror "Not started from the Trunk directory or not a valid SVN repository. Aborting.\n";
}
@@ -487,7 +487,7 @@
sub check_uncommited {
my @conflicts;
- open(SVN, "svn status |") or die ("Can't open `svn status`: $!");
+ open(SVN, "env LC_ALL=C svn status |") or die ("Can't open `svn status`: $!");
for(<SVN>) {
if(/^\s*M+\s+(.*)/) {
# FIXME: rewrite to run svn propget in one command with a list if
Index: svn-upgrade
===================================================================
--- svn-upgrade (revision 5646)
+++ svn-upgrade (working copy)
@@ -172,7 +172,7 @@
my $c=\%SDCommon::c;
if($opt_replay) {
- for(split(/\n/,`svn status`)) {
+ for(split(/\n/,`env LC_ALL=C svn status`)) {
if(/^C\s+(.*)/) {
withecho("svn cat ".$$c{"upsCurrentUrl"}."/$1 > $1 && svn resolved $1");
}
@@ -332,7 +332,7 @@
chdir $$c{"trunkDir"};
}
-open(SVN, "svn status|") or die ("Failed tu run `svn status`: $!");
+open(SVN, "env LC_ALL=C svn status|") or die ("Failed tu run `svn status`: $!");
my @conflicts = grep(/^C/, <SVN>);
close SVN;
map {s/^..//} @conflicts;
