Changeset 963

Timestamp:

02/08/10 03:47:36 (3 years ago)

Author:

bruno

Message:

r3658@localhost: bruno | 2010-02-07 00:15:25 +0100

• Fix a bug in newve, by calling pb_distrib_init earlier to have the loading of the pb.conf main conf file, used to install default packages.

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (4 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb/bin/pb (modified) (3 diffs)

devel/pb-modules/etc/pb.conf

@@ -224 +224 @@
 osremovedotinver redhat = true
 
-# These deps are needed before setupvm can be run. 
+# These deps are needed before setupvm|ve can be run. 
 # Install them with your distribution in VM or automatically in VE
 osmindep default = perl,sudo,wget,tar,make,gzip

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

@@ -93 +93 @@
     # Add the new one at the end
     my $num = keys %pbconffiles;
+    pb_log(2,"DEBUG: pb_conf_add $cf at position $num\n");
     $pbconffiles{$cf} = $num;
 }
@@ -169 +170 @@
 =item B<pb_conf_get_if>
 
-This function returns a table, corresponding to a set of values querried in the conf files or undef if it doen't exist. It takes a table of keys as an input parameter.
+This function returns a table, corresponding to a set of values queried in the conf files or undef if it doen't exist. It takes a table of keys as an input parameter.
 
 The format of the configurations file is as follows:
@@ -206 +207 @@
 # the most important conf file is first, so read them in reverse order
 foreach my $f (reverse sort { $pbconffiles{$a} <=> $pbconffiles{$b} } keys %pbconffiles) {
+    pb_log(2,"DEBUG: pb_conf_get_if in file $f\n");
     $ptr = pb_conf_get_fromfile_if("$f",$ptr,@param);
 }
@@ -241 +243 @@
 my $p2;
 
-pb_log(2,"DEBUG: pb_conf_get $conffile: ".Dumper(@ptr1)."\n");
-pb_log(2,"DEBUG: pb_conf_get input: ".Dumper(@ptr2)."\n");
-pb_log(2,"DEBUG: pb_conf_get param: ".Dumper(@param)."\n");
+pb_log(2,"DEBUG: pb_conf_get_from_file $conffile: ".Dumper(@ptr1)."\n");
+pb_log(2,"DEBUG: pb_conf_get_from_file input: ".Dumper(@ptr2)."\n");
+pb_log(2,"DEBUG: pb_conf_get_from_file param: ".Dumper(@param)."\n");
 
 foreach my $i (0..$#param) {

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

@@ -439 +439 @@
     $param = $opt->{"default"};
 } else {
-    $param = "unknown";
+    $param = "";
 }
 return($param);

devel/pb/bin/pb

@@ -1721 +1721 @@
     # VE here
     } else {
-        # Get VE context
-        my ($ptr,$vetmout,$vepath,$verebuild,$veconf,$vepostinstall) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
-        my ($veb4pi,$vepi,$vesnap,$oscodename,$vepkglist,$osmindep) = pb_conf_get_if("veb4pi","vepi","vesnap","oscodename","vepkglist","osmindep");
-        my $vetype = $ptr->{$ENV{'PBPROJ'}};
-
         # Get distro context
         my ($name,$ver,$darch) = split(/-/,$v);
         chomp($darch);
         my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
+
+        # Get VE context
+        my ($ptr,$vetmout,$vepath,$verebuild,$veconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
+        my $vetype = $ptr->{$ENV{'PBPROJ'}};
+
+        # We can probably only get those params now we have the distro context
+        my ($veb4pi,$vepi,$vesnap,$oscodename,$vepkglist,$osmindep) = pb_conf_get_if("veb4pi","vepi","vesnap","oscodename","vepkglist","osmindep");
 
         if (($vetype eq "chroot") || ($vetype eq "schroot")) {
@@ -1767 +1769 @@
                         $postparam .= ",";
                         $postparam .= pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
-                        if ($postparam eq "") {
+                        if ($postparam eq ",") {
                             $addpkgs = "";
                         } else {
@@ -1796 +1798 @@
                     $postparam .= ",";
                     $postparam .= pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
-                    if ($postparam eq "") {
+                    if ($postparam eq ",") {
                         $addpkgs = "";
                     } else {