Bug#431898: Acknowledgement (svn-buildpackage: new option: --svn-moved (or --svn-look-for-results-in, or similar))

[sean finney]

retitle 431898 new option: "--svn-moved-to" for build results elsewhere
tags 431898 patch
thanks

here's a patch that does just that.  it's fairly straightforward so i'll let 
the patch do the talking.  i haven't patched any of the documentation 
(besides the help string) since i haven't heard yet whether or not i'm 
wasting my time :)


        sean

--- /usr/bin/svn-buildpackage.orig	2007-07-05 22:21:20.000000000 +0200
+++ /usr/bin/svn-buildpackage	2007-07-05 22:34:28.000000000 +0200
@@ -75,6 +75,7 @@
 my @opt_override;
 my $opt_move;
 my $opt_move_to;
+my $opt_moved_to;
 my $opt_noautodch;
 my $package;
 
@@ -105,6 +106,7 @@
    "pre-build-action=s"    => \$opt_prebuild,
    "post-build-action=s"   => \$opt_postbuild,
    "svn-move"             => \$opt_move,
+   "svn-moved-to=s"             => \$opt_moved_to,
    "svn-move-to=s"             => \$opt_move_to,
    "svn-builder=s"             => \$opt_buildcmd,
    "svn-override=s"             => [EMAIL PROTECTED],
@@ -317,6 +319,8 @@
 };
 
 my $ba=$$c{"buildArea"};
+my $ra=$ba;
+if ($opt_moved_to) { $ra = $opt_moved_to; }
 my $bdir="$ba/$package-$upVersion";
 
 if(!$opt_reuse && -e "$bdir") {
@@ -531,11 +535,11 @@
             next if ! $arch;
             my $file="$package"."_$tagVersionNonEpoch"."_$arch.changes";
             $file=~s/\r|\n//g; # something like chomp before does not work on constant values, 'source'
-            push(@newfiles, "$ba/$file") if -e "$ba/$file";
-            $chfile=$file if(-r "$ba/$file");
+            push(@newfiles, "$ra/$file") if -e "$ra/$file";
+            $chfile=$file if(-r "$ra/$file");
         }
 
-        if(open(CH, "<$ba/$chfile")) {
+        if(open(CH, "<$ra/$chfile")) {
             while(<CH>) { push(@newfiles, $1) if(/^\s\w+\s\d+\s\S+\s\w+\s(.+)\n/); }
             close(CH);
 
@@ -546,7 +550,7 @@
                     push(@newfiles, $orig_target);
                 }
             }
-            else { $destdir=$ba; }
+            else { $destdir=$ra; }
 
             # expand the paths in the list and kick non-binary packages
 	          my $multi=0;
@@ -565,7 +569,7 @@
         else
         {
             print STDERR `tput smso` if ($opt_move);
-            print STDERR "Could not read the .changes file: $ba/$chfile";
+            print STDERR "Could not read the .changes file: $ra/$chfile";
             print STDERR " and thus failed to move the resulting files." if ($opt_move);
             print STDERR "\n";
         }

signature.asc
Description: This is a digitally signed message part.