Changeset 1352 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.pm

Timestamp:

Oct 30, 2011, 10:36:43 AM (13 years ago)

Author:

Bruno Cornec

Message:

r4384@localhost: bruno | 2011-10-30 01:28:14 +0200

• Change pb_ve_launch interface (remove useless second parameter)
• Force call to pb_ve_launch with pbforce to always create the chroot in pbmkbm

File:

• devel/pb-modules/lib/ProjectBuilder/VE.pm (modified) (2 diffs)

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

@@ -62 +62 @@
 
 my $v = shift || undef;
-my $create = shift || 0;        # By default do not create a VM/VE/RM
 my $pbforce = shift || 0;       # By default do not rebuild VE
 my $pbsnap = shift || 0;        # By default do not snap VE
@@ -73 +72 @@
 my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
-# We can probably only get those params now we have the distro context
-my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
-
-# We need to avoid umask propagation to the VE
-umask 0022;
-
-# If we are already root (from pbmkbm e.g.) don't use sudo, just call the command
-my $sudocmd="";
-$sudocmd ="sudo " if ($EFFECTIVE_USER_ID != 0);
-
-my $arch = pb_get_arch();
-
 if (($vetype eq "chroot") || ($vetype eq "schroot")) {
+
+    # We need to avoid umask propagation to the VE
+    umask 0022;
+
+    # We can probably only get those params now we have the distro context
+    my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
+
     # Architecture consistency
+    my $arch = pb_get_arch();
     if ($arch ne $pbos->{'arch'}) {
         die "Unable to launch a VE of architecture $pbos->{'arch'} on a $arch platform" if (($pbos->{'arch'} eq "x86_64") && ($arch =~ /i?86/));
     }
 
-    my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
-    if (($create != 0) || ((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) {
-    my ($rbsopt1) = pb_conf_get_if("rbsopt");
+    # If we are already root (from pbmkbm e.g.) don't use sudo, just call the command
+    my $sudocmd="";
+    $sudocmd ="sudo " if ($EFFECTIVE_USER_ID != 0);
+
+    if (((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) {
+        my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
+        my ($rbsopt1) = pb_conf_get_if("rbsopt");
 
         # We have to rebuild the chroot