Changeset 180

Timestamp:

05/27/15 21:44:09 (10 years ago)

Author:

kdeugau

Message:

/trunk

A couple of miscellaneous accumulated fixes:

• Fine-tune handling for dependency checking; provide some extra feedback on what packages to install, and try harder to detect virtual-package-vs-real-package.
• Drop an obsolete macro from the macro expander. Obsolete at least so far as "it doesn't exist any more in CentOS 5"

Location:

trunk

Files:

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

trunk/Makefile

@@ -6 +6 @@
 
 PKGNAME=debbuild
-VERSION=0.9.9
+VERSION=0.9.10
 
 MANDIR=/usr/share/man

trunk/debbuild

@@ -32 +32 @@
 use Config;
 
-my $version = "0.9.9";  #VERSION#
+my $version = "0.9.10"; #VERSION#
 
 # regex debugger
@@ -1485 +1485 @@
   my @reqlist = split /,\s+/, $buildreq;
 
+  my @missinglist;
   foreach my $req (@reqlist) {
     # from rpmbuild error message
@@ -1502 +1503 @@
     }
 
+## Apparently a package that has been installed, then uninstalled, has a "known" dpkg status of
+## "unknown ok not-installed" vs a package that has never been installed which returns nothing.  O_o
+## Virtual packages, of course, *also* show as "not installed" like this (WTF?)
+## This causes real packages to be misdetected as installed "possible virtual packages" instead of "missing
+## packages".  I don't think there's really a solution until/unless Debian's tools properly register virtual
+## packages as installed.
     my @pkglist = qx { dpkg-query --showformat '\${status}\t\${version}\n' -W $pkg };
     if (!$pkglist[0]) {
-      print " * Missing build-dependency $pkg!\n";
+      print " * Missing build-dependency $pkg!\n  $pkglist[0]";
       $reqflag = 0;
+      push @missinglist, $pkg;
     } else {
 # real package, installed
@@ -1529 +1537 @@
       } else {
         # whatever state it's in, it's not completely installed, therefore it's missing.
-        print " * Missing build-dependency $pkg!\n";
+        print " * Missing build-dependency $pkg!\n  $pkglist[0]";
         $reqflag = 0;
+        push @missinglist, $pkg;
       } # end not installed/installed check
     }
   } # end req loop
+
+  print "To install all missing dependencies, run 'apt-get install ".join(' ', @missinglist)."'.\n" unless $reqflag;
 
   return $reqflag;
@@ -1756 +1767 @@
 
     $macrostring =~ s|%{_builddir}|%{_topdir}/BUILD|g;
-    $macrostring =~ s|%{buildsubdir}|$tarballdir|g;
+# no longer a valid macro/tag
+#    $macrostring =~ s|%{buildsubdir}|$tarballdir|g;
     $macrostring =~ s|%{_topdir}|$topdir|g;
     $macrostring =~ s|%{_tmppath}|$tmpdir|g;