Changeset 1606

Timestamp:

05/28/12 03:41:43 (12 months ago)

Author:

bruno

Message:

• Adds pbstoponerr option in conf file to allow to overwrite the default which is back to not stopping on errors as it perturbates VE and VM build for themoment, as not all commands are expected to succeed systematically.

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)
• pb/t/pbtest (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -632 +632 @@
 pbshowsudo default = false
 
+# Do not stop on errors by default (VE/VM are still broken with it on)
+pbstoponerr default = false
+
 # How do you want to install pb in your VM/VE (pkg or file)
 pbinstalltype default = pkg

devel/pb-modules/etc/pb.conf.pod

@@ -576 +576 @@
  Example: pbsockscmd default = tsocks
 
+=item B<pbstoponerr>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: false (by default), meaning that commands giving errors will not stop execution of the pb job. For quicker error solving, you may want to turn it to true in order to stop at the first error. Be aware that project-builder.org is not robust enough to work fully correctly with this on. Especially some commands may in a justified way error out, and you still want the process to go on.
+ Conffile: home
+ Example: pbstoponerr mondorescue = true
+
+
 =item B<pburl>
 

devel/pb/bin/pb

@@ -741 +741 @@
 # Check for command requirements
 #
-my ($req,$opt,$pbpara,$pbshowsudo) = pb_conf_get_if("oscmd","oscmdopt","pbparallel","pbshowsudo");
+my ($req,$opt,$pbpara,$pbshowsudo,$pbstoponerr) = pb_conf_get_if("oscmd","oscmdopt","pbparallel","pbshowsudo","pbstoponerr");
 pb_check_requirements($req,$opt,$appname);
 
 $Global::pb_show_sudo = 1 if ((defined $pbshowsudo) && (defined $pbshowsudo->{$ENV{'PBPROJ'}}) && ($pbshowsudo->{$ENV{'PBPROJ'}} =~ /true/oi));
+$Global::pb_stop_on_error = 1 if ((defined $pbstoponerr) && (defined $pbstoponerr->{$ENV{'PBPROJ'}}) && ($pbstoponerr->{$ENV{'PBPROJ'}} =~ /true/oi));
 
 #

devel/pb/t/pbtest

@@ -346 +346 @@
 
 # need tobe part of group video for KVM
-sudocmd "grep -Eq '^video:' /etc/group | grep $PBUSER"
+sudocmd "grep -Eq '^video:' /etc/group" | grep $PBUSER
 if [ $? -ne 0 ]; then
     sudocmd "perl -pi -e 's|^(video:.*)$|$1,$ENV{'PBUSER'}|' /etc/shadow"