Changeset 1530 in ProjectBuilder

Timestamp:

May 12, 2012, 3:36:08 AM (12 years ago)

Author:

Bruno Cornec

Message:

• ossueminorrel option now initialized first, and correectly. Removes warnings.
• other smaller fixes for CMD usage

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)
• lib/ProjectBuilder/VE.pm (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -288 +288 @@
 # Should be in sync wirh regular expressions from osrelexpr upper
 #osuseminorrel rhel = true
+osuseminorrel default = false
 
 # These deps are needed before setupvm|ve can be run. 

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

@@ -134 +134 @@
 # Dig into the tuple to find the best answer
 # Do NOT factorize here, as it won't work as of now for hash creation
+# Do NOT change order without caution
+$pbos->{'useminor'} = pb_distro_get_param($pbos,pb_conf_get("osuseminorrel"));
 $pbos->{'family'} = pb_distro_get_param($pbos,pb_conf_get("osfamily"));
 $pbos->{'type'} = pb_distro_get_param($pbos,pb_conf_get("ostype"));
-($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'},$pbos->{'useminor'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd","osuseminorrel"));
+($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd"));
 #($pbos->{'family'},$pbos->{'type'},$pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("osfamily","ostype","os","osins","ossuffix","osnover","osremovedotinver","osupd"));
 
@@ -454 +456 @@
             $ok = 1 if /^ii\s+$p/;
         }
+        close(CMD);
         next if $ok;
         pb_log(1, "INFO: missing dependency $p\n");
@@ -620 +623 @@
 # Loop to include also previous minor versions
 # if configured so
-if (($pbos->{'useminor'} eq "true") && ($pbos->{version} =~ /^(\d+)\.(\d+)$/o)) {
+if ((defined $pbos->{'useminor'}) && ($pbos->{'useminor'} eq "true") && ($pbos->{'version'} =~ /^(\d+)\.(\d+)$/o)) {
         my ($major, $minor) = ($1, $2);
         while ($minor > 0) {
                 $minor--;
-                push (@keylist, "$pbos->{name}-${major}.$minor");
+                push (@keylist, "$pbos->{'name'}-${major}.$minor");
         }
-        push (@keylist, "$pbos->{name}-$major");
-}
-
-push (@keylist, $pbos->{name}, $pbos->{family}, $pbos->{type}, $pbos->{os}, $generic);
+        push (@keylist, "$pbos->{'name'}-$major");
+}
+
+push (@keylist, $pbos->{'name'}, $pbos->{'family'}, $pbos->{'type'}, $pbos->{'os'}, $generic);
 return @keylist;
 }

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

@@ -100 +100 @@
         foreach my $proxy (qw/http_proxy ftp_proxy/) {
             if (defined $ENV{$proxy}) {
-                open(<CMD>,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!";
+                open(CMD,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!";
                 $_ = <CMD>;
                 chomp();
                 die "sudo not passing through env var $proxy; '$ENV{$proxy}' != '$_'\nAdd line Defaults:`whoami` env_keep += \"$proxy\" to sudoers file?" unless $_ eq $ENV{$proxy};
+                close(CMD);
             }
         }
+    }
     # Handle cross arch on Intel based platforms
     $sudocmd = "setarch i386 $sudocmd" if (($pbos->{arch} =~ /i?86/) && ($arch eq 'x86_64'));