Changeset 1598

Timestamp:

05/26/12 02:43:56 (13 months ago)

Author:

bruno

Message:

• pb now also build itself in a debian 6 VM again (ntp may error)

File:

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

devel/pb/bin/pb

@@ -2685 +2685 @@
 my $ntpline = undef;
 
-if (defined $vntp) {
+if ((defined $vntp) && ($vntp !~ /^\s*$/)) {
     # ntp command depends on pbos
     my $vntpcmd = pb_distro_get_param($pbos,pb_conf_get($vtype."ntpcmd"));
@@ -3270 +3270 @@
     next if (/^$pbac->{$ENV{'PBPROJ'}}\\s+/);
     next if (/^Defaults:$pbac->{$ENV{'PBPROJ'}}\\s+/);
-    next if (/^Defaults:root \!requiretty/);
-    next if (/^Defaults:root env_keep/);
+    next if (/^Defaults:root\\s+\!requiretty/);
+    next if (/^Defaults:root\\s+env_keep/);
 EOF
     print SCRIPT << 'EOF';
@@ -3323 +3323 @@
         # Sync date
         # do it after sudoers is setup
-        print SCRIPT "pb_system(\"$ntpline\");\n";
+        print SCRIPT "pb_system(\"$ntpline\",\"Setting up time\",\"mayfail\");\n";
     }
     # We may need a proxy configuration. Get it from the local env