Changeset 188 for trunk

Timestamp:

07/11/15 22:31:45 (9 years ago)

Author:

kdeugau

Message:

/trunk

Fine-tune handling of %setup -c, -a, and -b to correctly handle a missed
edge case, as per a report from Andreas Scherer.

File:

• trunk/debbuild (modified) (8 diffs)

trunk/debbuild

@@ -695 +695 @@
     if (/^\%build/) {
       $stage = 'build';
-      $buildscript .= "cd $tarballdir\n" if $pkgdata{main}{hassetup};
+      $buildscript .= "cd '$tarballdir'\n" if $pkgdata{main}{hassetup};
       next LINE;
     } # %build
@@ -701 +701 @@
     if (/^\%install/) {
       $stage = 'install';
-      $installscript .= "cd $tarballdir\n" if $pkgdata{main}{hassetup};
+      $installscript .= "cd '$tarballdir'\n" if $pkgdata{main}{hassetup};
       next LINE;
     } # %install
@@ -707 +707 @@
     if (/^\%clean/) {
       $stage = 'clean';
-      $cleanscript .= "cd $tarballdir\n" if $pkgdata{main}{hassetup};
+      $cleanscript .= "cd '$tarballdir'\n" if $pkgdata{main}{hassetup};
       next LINE;
     } # %clean
@@ -787 +787 @@
         my $altsource = 0;
 
+        # yes, really.  It's not clear how this cascades down to %build or %install, but evidence suggests ?
+        my $thistarballdir = $tarballdir;
+
         my @sbits = split /\s+/;
         shift @sbits;
         while (my $sopt = shift @sbits) {
           if ($sopt eq '-n') {
-            $tarballdir = shift @sbits;
+            $thistarballdir = shift @sbits;
           } elsif ($sopt eq '-a') {
             # shift, next opt must be numeric (which sourcenn:)
@@ -830 +833 @@
         $prepscript .= "cd '$topdir/BUILD'\n";
         $tarballdir = expandmacros($tarballdir,'gp');
-        $prepscript .= "rm -rf '$tarballdir'\n" if $deldir;
-        $prepscript .= "/bin/mkdir -p $tarballdir\n" if $changedir;
+        $prepscript .= "rm -rf '$thistarballdir'\n" if $deldir;
+        $prepscript .= "/bin/mkdir -p $thistarballdir\n" if $changedir;
 
         if ($deftarball) {
+          $prepscript .= "cd '$thistarballdir'\n" if $changedir;
           $prepscript .=
                 ( $pkgdata{main}{source} =~ /\.tar\.gz$/  ? "/bin/gzip"   : "" ).
@@ -845 +849 @@
         if ($altsource) {
           if ($altsource == 1) { # -a
-            $prepscript .= "cd '$tarballdir'\n";
+            $prepscript .= "cd '$thistarballdir'\n";
             $prepscript .=
                 ( $pkgdata{sources}{$snum} =~ /\.tar\.gz$/  ? "/bin/gzip"   : "" ).
@@ -863 +867 @@
                 ( $quietunpack ? '' : 'vv' )."f -\n".
                 qq(STATUS=\$?\nif [ \$STATUS -ne 0 ]; then\n  exit \$STATUS\nfi\n);
-            $prepscript .= "cd '$tarballdir'\n";
+            $prepscript .= "cd '$thistarballdir'\n";
           } # $altsource == 2
-        } else {
-          $prepscript .= "cd '$tarballdir'\n" unless $changedir;
         }
 
@@ -2105 +2107 @@
 debbuild.  However, rpmbuild doesn't create these directories either.
 
+debbuild's %setup -q is arguably less buggy than rpmbuild's implementation;  with rpmbuild
+it must appear before -a or -b at least to be effective.  debbuild does not care.
+
+%setup -c, -a, and -b should arguably throw errors if specified together;  otherwise the
+results are almost certainly not what you want to happen.
+
 =head1 SEE ALSO