Changeset 1597 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

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.

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (1 diff)
• Distribution.pm (modified) (1 diff)
• Env.pm (modified) (1 diff)
• VE.pm (modified) (2 diffs)

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -157 +157 @@
 
 # If sudo used, then be more verbose
-pb_log(0,"Executing $cmd\n") if (($pbdebug < 1) && ($cmd =~ /^\s*\S*sudo/o));
+pb_log(0,"Executing $cmd\n") if (($pbdebug < 1) && ($cmd =~ /^\s*\S*sudo/o) && (defined $Global::pb_show_sudo) && ($Global::pb_show_sudo =~ /true/oi));
 
 system("$cmd $redir");

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -450 +450 @@
         pb_log(1, "INFO: missing dependency $p\n");
     } elsif ($pbos->{'type'} eq "deb") {
-        my $res = pb_system("dpkg -L $p","","mayfail");
+        my $res = pb_system("dpkg -L $p","Looking for $p","mayfail");
         next if ($res eq 0);
         open(CMD,"dpkg -l $p |") or die "Unable to run dpkg -l $p: $!";

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -983 +983 @@
     INSTALL_PROGRAM += -s
 endif
+
 config.status: configure
     dh_testdir
 
     # Configure the package.
-    CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
- --mandir=\$${prefix}/share/man
+    CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
 
 # Build both architecture dependent and independent

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -248 +248 @@
         }
     }
-    
-    # Fix modes to allow access to the VE for pb user
-    my $command = pb_check_req("chmod",0);
-    pb_system("$sudocmd $command 755 $root/$pbos->{'name'} $root/$pbos->{'name'}/$pbos->{'version'} $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}","Fixing permissions");
 
     # Test if an existing snapshot exists and use it if appropriate
@@ -265 +261 @@
             pb_system("$sudocmd $cmd1 -rf $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} ; $sudocmd $cmd2 -p $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} ; $sudocmd $cmd3 xz  -C $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} -f $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz","Extracting snapshot of $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz under $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
     }
+    
+    # Fix modes to allow access to the VE for pb user
+    my $command = pb_check_req("chmod",0);
+    pb_system("$sudocmd $command 755 $root/$pbos->{'name'} $root/$pbos->{'name'}/$pbos->{'version'} $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}","Fixing permissions");
+
     # Nothing more to do for VE. No real launch
 } else {