Changeset 1597 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

May 26, 2012, 2:13:12 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds option pbshowsudo (false by default) to check whether we display the detail of sudo commands (to match security requiremetns) or not (to have a nicer output)
• Fix a template generation error in Env.pm for deb rules file (line was split)
• In VE.pm fix modes of the chroot after the snapshot phase detection to avoid error which make the code die
• In pb create the RPM build dirs before entering in the parallel loop as sometimes 2 identical were created simultaneously, leading to an error leading to a die
• In pb revert the code added by Eric to check deb content creation as it was failing in my environement (naming issues). Could be added after 0.12.1 is out as an additional check, but anyway as the files are copied after, it's not that important.
• Use full path of chown in sudo for pb
• Make the test account a variable in pbtest
• Start to add test case for a VM in pbtest
• This patch makes pb build back in a debian 6 VE.

File:

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

devel/pb/bin/pb

@@ -42 +42 @@
 
 # Global variables
-$Global::pb_stop_on_error = 1;
+$Global::pb_stop_on_error = 1;  # True by default
+$Global::pb_show_sudo = 0;      # False by default
+
 my %opts;                   # CLI Options
 my $action;                 # action to realize
@@ -739 +741 @@
 # Check for command requirements
 #
-my ($req,$opt,$pbpara) = pb_conf_get_if("oscmd","oscmdopt","pbparallel");
+my ($req,$opt,$pbpara,$pbshowsudo) = pb_conf_get_if("oscmd","oscmdopt","pbparallel","pbshowsudo");
 pb_check_requirements($req,$opt,$appname);
+
+$Global::pb_show_sudo = 1 if ((defined $pbshowsudo) && (defined $pbshowsudo->{$ENV{'PBPROJ'}}) && ($pbshowsudo->{$ENV{'PBPROJ'}} =~ /true/oi));
 
 #
@@ -1432 +1436 @@
     pb_mkdir_p($tmpd) if (defined $pbparallel);
 
+    # Do it here as this doesn't work in // mode as itdies if it fails
+    if ($pbos->{'type'} eq "rpm") {
+        foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
+                if (! -d "$ENV{'PBBUILDDIR'}/$d") {
+                    pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d");
+                }
+            }
+    }
+
     foreach my $pbpkg (@pkgs) {
         $pm->start and next if (defined $pbparallel);
@@ -1447 +1460 @@
         pb_log(2,"Working directory: $ENV{'PBBUILDDIR'}\n");
         if ($pbos->{'type'} eq "rpm") {
-            foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
-                if (! -d "$ENV{'PBBUILDDIR'}/$d") {
-                    pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d");
-                }
-            }
-
             # Remove in case a previous link/file was there
             unlink "$ENV{'PBBUILDDIR'}/SOURCES/".basename($src);
@@ -1548 +1555 @@
             #pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbsrc/","$ENV{'PBBUILDDIR'}/debian","src");
 
+            # This can create problems in // mode as well
             pb_distro_installdeps("debian/control",$pbos);
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
+
             # Get the name of the generated packages
             open(LOG,"$ENV{'PBTMP'}/system.$$.log") || die "Unable to open $ENV{'PBTMP'}/system.$$.log";
-            my $tmp = "";
             while (<LOG>) {
                 chomp();
+                pb_log(3,"In loop: $_\n");
                 next unless (/^dpkg-deb.*:\s+building\s+package\s+.*\s+in\s+\`\.\.\/(\S+)\'\./o);
-                $tmp = $1;
-                die "Missing file $tmp" if (not -f $tmp);
+                my $tmp = $1;
+                #doesn't work in my case
+                #die "Missing file $tmp" if (not -f "../$tmp");
                 $made = "$made $tmp";
             }
             close(LOG);
-            open(CTRL,"debian/control") or die "Unable to open debian/control: $!";
-            #$made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
+            pb_log(2,"Now made is: $made\n");
+
+            open(CTRL,"debian/control") || die "Unable to open debian/control: $!";
             while (<CTRL>) {
+                pb_log(3,"In loop: $_\n");
                 next unless (/^Source: (\S+)/o);
-                foreach my $glob (("$1\_*.changes", "$1\_*.dsc", "$1\_*.tar.gz")) {
-                    my @file = glob($glob);
-                    die "Missing file for $glob" unless @file > 0;
-                    die "Too many files for $glob" if @file > 1;
-                    die "Missing file $file[0]" if (not -f $file[0]);
-                    $made .= " $file[0]";
-                }
+                my $tmp = $1;
+                $made = "$made $tmp"."_*.dsc $tmp"."_*.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
+                #doesn't work in my case
+                #foreach my $glob (("$1\_*.changes", "$1\_*.dsc", "$1\_*.tar.gz")) {
+                    #my @file = glob($glob);
+                    #die "Missing file for $glob" unless (@file > 0);
+                    #die "Too many files for $glob" if (@file > 1);
+                    #die "Missing file $file[0]" if (not -f $file[0]);
+                    #$made .= " $file[0]";
+                #}
             }
             close(CTRL);
-            pb_display_file("$ENV{'PBTMP'}/system.$$.log");
+            #pb_display_file("$ENV{'PBTMP'}/system.$$.log");
+            pb_log(2,"Finally made is: $made\n");
 
             chdir ".." || die "Unable to chdir to parent dir";
-            pb_rm_rf("$pbpkg-$pbver");
+            pb_rm_rf("$pbpkg-$pbver$pbextdir");
         } elsif ($pbos->{'type'} eq "ebuild") {
             my @ebuildfile;
@@ -2345 +2361 @@
         # For VE we need to change the owner manually
         if ($cmt eq "VEbuild") {
-            pb_system("sudo chown $UID $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$","Adapt owner in $tdir to $UID");
+            my $command = pb_check_req("chown",0);
+            pb_system("sudo $command $UID $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$","Adapt owner in $tdir to $UID");
         }
         if (not -f "$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") {
@@ -2733 +2750 @@
         $i++;
     }
-    print SCRIPT "set -e\n" if $Global::pb_stop_on_error;
+    print SCRIPT "set -e\n" if ($Global::pb_stop_on_error);
     # Activate script verbosity if at least 2 for pbdebug
     print SCRIPT "set -x\n" if ($i gt 1);