Changeset 1716 in ProjectBuilder for devel

Timestamp:

Mar 12, 2013, 5:24:42 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix an error in VMbuild where ' were misplaced leading to the script being printed and not executed
• Document ossudoersmode for pb.conf

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (3 diffs)

devel/pb-modules/etc/pb.conf

@@ -251 +251 @@
 osins opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n install --auto-agree-with-licenses
 osins redhat = sudo /bin/rpm -i --ignorearch
-osins sol = sudo pkgadd -d
+osins sol = sudo /usr/sbin/pkgadd -d
 osins lsb = /bin/true
 

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

@@ -424 +424 @@
  Example: ossha fedora-10 = sha1
 
+=item B<ossudoersmode>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: suffix that will be used in the name of the packages created. By default, concatenation of OS name and version.
+ Conffile: pb
+ Example: ossudoersmode novell = 640
+
 =item B<ossuffix>
 

devel/pb/bin/pb

@@ -2832 +2832 @@
 
     print SCRIPT "echo ... Execution needed\n";
-    print SCRIPT "echo '==== Start of script $$ for $vtype $v =====\n";
+    print SCRIPT "echo ==== Start of script $$ for $vtype $v =====\n";
     print SCRIPT "# This is in directory delivery\n";
     print SCRIPT "# Setup the variables required for building\n";
@@ -2856 +2856 @@
     print SCRIPT "echo setting up date with $ntpline\n";
     print SCRIPT "$ntpline\n";
-    print SCRIPT 'if [ $? -ne 0 ]; then\n';
+    print SCRIPT "if [ \$\? -ne 0 ]; then\n";
     # Force if bad status a trick using date
     $ntpline = pb_date2v($vtype,$pbos, 1);
@@ -2912 +2912 @@
     }
 
-    print SCRIPT "echo '==== End of script $$ for $vtype $v =====\n";
+    print SCRIPT "echo ==== End of script $$ for $vtype $v =====\n";
     close(SCRIPT);
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript.$$";