Changeset 196

Timestamp:

07/15/15 21:34:28 (9 years ago)

Author:

kdeugau

Message:

/trunk

Revert change in $tarballdir flow down from %prep into %build etc;
as per Andreas Scherer's report and further testing, it was incorrect.

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• debbuild (modified) (5 diffs)

trunk/Makefile

@@ -6 +6 @@
 
 PKGNAME=debbuild
-VERSION=0.11.1
+VERSION=0.11.2
 
 MANDIR=/usr/share/man

trunk/debbuild

@@ -32 +32 @@
 use Config;
 
-my $version = "0.11.1"; #VERSION#
+my $version = "0.11.2"; #VERSION#
 
 # regex debugger
@@ -874 +874 @@
         my $altsource = 0;
 
-        # yes, really.  It's not clear how this cascades down to %build or %install
-        my $thistarballdir = $tarballdir;
-
         my @sbits = split /\s+/;
         shift @sbits;
         while (my $sopt = shift @sbits) {
           if ($sopt eq '-n') {
-            $thistarballdir = shift @sbits;
+            $tarballdir = shift @sbits;
           } elsif ($sopt eq '-a') {
             # shift, next opt must be numeric (which sourcenn:)
@@ -920 +917 @@
         $prepscript .= "cd '$topdir/BUILD'\n";
         $tarballdir = expandmacros($tarballdir,'gp');
-        $prepscript .= "rm -rf '$thistarballdir'\n" if $deldir;
-        $prepscript .= "/bin/mkdir -p $thistarballdir\n" if $changedir;
+        $prepscript .= "rm -rf '$tarballdir'\n" if $deldir;
+        $prepscript .= "/bin/mkdir -p $tarballdir\n" if $changedir;
 
         if ($deftarball) {
-          $prepscript .= "cd '$thistarballdir'\n" if $changedir;
+          $prepscript .= "cd '$tarballdir'\n" if $changedir;
           $prepscript .=
                 ( $pkgdata{main}{source} =~ /\.tar\.gz$/  ? "/bin/gzip"   : "" ).
@@ -936 +933 @@
         if ($altsource) {
           if ($altsource == 1) { # -a
-            $prepscript .= "cd '$thistarballdir'\n";
+            $prepscript .= "cd '$tarballdir'\n";
             $prepscript .=
                 ( $pkgdata{sources}{$snum} =~ /\.tar\.gz$/  ? "/bin/gzip"   : "" ).
@@ -954 +951 @@
                 ( $quietunpack ? '' : 'vv' )."f -\n".
                 qq(STATUS=\$?\nif [ \$STATUS -ne 0 ]; then\n  exit \$STATUS\nfi\n);
-            $prepscript .= "cd '$thistarballdir'\n";
+            $prepscript .= "cd '$tarballdir'\n";
           } # $altsource == 2
         }