Changeset 69

Timestamp:

06/21/06 12:36:16 (19 years ago)

Author:

kdeugau

Message:

/trunk

Clean up handling of %setup expansion - support both -c and -n.
Note that just like rpm, -c MUST come before -n, eg:

%setup -c -n mybuilddirname

not:

%setup -n -c mybuilddirname

I think it'll even fail the same way...

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -444 +444 @@
               $tarballdir = "$pkgdata{main}{name}-$pkgdata{main}{version}";
             }
-            $prepscript .= "rm -rf $tarballdir\ntar -".
+            $tarballdir = expandmacros($tarballdir,'gp');
+            $prepscript .= "rm -rf $tarballdir\n";
+            if (/\s+-c\s+/) {
+              $prepscript .= "mkdir $tarballdir\ncd $tarballdir\n";
+            }
+            $prepscript .= "tar -".
                 ( $pkgdata{main}{source} =~ /\.tar\.gz$/ ? "z" : "" ).
                 ( $pkgdata{main}{source} =~ /\.tar\.bz2$/ ? "j" : "" ).
@@ -450 +455 @@
                 "$topdir/SOURCES/$pkgdata{main}{source}\n".
                 qq(STATUS=\$?\nif [ \$STATUS -ne 0 ]; then\n  exit \$STATUS\nfi\n).
-                ( /\s+-n\s+([^\s]+)\s+/ ?
-                  "cd $1\n" : "cd $pkgdata{main}{name}-$pkgdata{main}{version}\n" ).
+                "cd $topdir/BUILD/$tarballdir\n".
                 qq([ `/usr/bin/id -u` = '0' ] && /bin/chown -Rhf root .\n).
                 qq([ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root .\n).