Changeset 963 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Feb 8, 2010, 3:47:36 AM (14 years ago)

Author:

Bruno Cornec

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.

File:

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

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 {