Changeset 567 in ProjectBuilder

Timestamp:

Sep 30, 2008, 12:10:32 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Pass verbose level to pb launched in virtual environments/machines
• Fix a bug on package nae detection on Ubuntu (dpkg-deb output different from the Debian one !)

Files:

• 0.9.4/pb/bin/pb (modified) (2 diffs)
• devel/pb/bin/pb (modified) (2 diffs)

0.9.4/pb/bin/pb

@@ -867 +867 @@
                 chomp();
                 my $tmp = $_;
-                next if ($tmp !~ /^dpkg-deb.:/);
+                next if ($tmp !~ /^dpkg-deb.*:/);
                 $tmp =~ s|.*../(.*)_(.*).deb.*|$1|;
                 $made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
@@ -1495 +1495 @@
 print SCRIPT "# Build\n";
 print SCRIPT "echo Building packages on $vtype...\n";
-print SCRIPT "pb -p $ENV{'PBPROJ'} build2pkg $p\n";
+
+# Transmit the verbosity level to the virtual env/mach.
+my $verbose = "";
+my $i = 0;                          # minimal debug level
+while ($i lt $pbdebug) {
+    $verbose .= "-v ";
+    $i++;
+}
+# Quiet if asked to be so on the original system
+$verbose = "-q" if ($pbdebug eq -1);
+print SCRIPT "pb $verbose -p $ENV{'PBPROJ'} build2pkg $p\n";
 close(SCRIPT);
 chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";

devel/pb/bin/pb

@@ -867 +867 @@
                 chomp();
                 my $tmp = $_;
-                next if ($tmp !~ /^dpkg-deb.:/);
+                next if ($tmp !~ /^dpkg-deb.*:/);
                 $tmp =~ s|.*../(.*)_(.*).deb.*|$1|;
                 $made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
@@ -1495 +1495 @@
 print SCRIPT "# Build\n";
 print SCRIPT "echo Building packages on $vtype...\n";
-print SCRIPT "pb -p $ENV{'PBPROJ'} build2pkg $p\n";
+
+# Transmit the verbosity level to the virtual env/mach.
+my $verbose = "";
+my $i = 0;                          # minimal debug level
+while ($i lt $pbdebug) {
+    $verbose .= "-v ";
+    $i++;
+}
+# Quiet if asked to be so on the original system
+$verbose = "-q" if ($pbdebug eq -1);
+print SCRIPT "pb $verbose -p $ENV{'PBPROJ'} build2pkg $p\n";
 close(SCRIPT);
 chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";