Changeset 541 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 15, 2008, 1:39:21 PM (17 years ago)

Author:

Bruno Cornec

Message:

Working on the correct .deb generation for virtual/real packages

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -563 +563 @@
             my $pbrealpkg = pb_cms_get_real_pkg($pbpkg,$pb{'dtype'});
             $pb{'realpkg'} = $pbrealpkg;
+            pb_log(1,"Virtual package $pbpkg has a real package name of $pbrealpkg on $ddir-$dver\n") if ($pbrealpkg ne $pbpkg);
 
             # Filter build files from the less precise up to the most with overloading
@@ -792 +793 @@
                 $made="$made $_";
             }
-
-            if (-f "/usr/bin/rpmlint") {
-                pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");
-            }
+            close(LOG);
+
         } elsif ($dtype eq "deb") {
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
@@ -811 +810 @@
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
             $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
-            if (-f "/usr/bin/lintian") {
-                pb_system("lintian $made","Checking validity of debs with lintian","verbose");
-            }
         } elsif ($dtype eq "ebuild") {
             my @ebuildfile;
@@ -881 +877 @@
         }
     }
+    # Packages check if needed
+    if ($dtype eq "rpm") {
+        if (-f "/usr/bin/rpmlint") {
+            pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");
+        }
+    } elsif ($dtype eq "deb") {
+        if (-f "/usr/bin/lintian") {
+            pb_system("lintian $made","Checking validity of debs with lintian","verbose");
+        }
+    } else {
+        pb_log(0, "No check done for $dtype yet");
+    }
+
     # Keep track of what is generated so that we can get them back from VMs
     open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}";