Changeset 1523 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

May 12, 2012, 2:22:11 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb.conf: Add scilinux to list of OS's. Add case where centos versioning include minor since centos makes major changes in minor releases. Fix typo in oracle linux regex. Proposes min dependencies separately for centos-5.2, 5.6 others just match that set. Add next ubuntu codename. (Eric Anderson)
• Distribution.pm: Add new pb_pbos_to_keylist function that generates the keys that should be used for looking up filter filenames or keys into the hash-maps. New function will generate 5.m, for all m in [0,n] for version 5.n of some OS. Useful because minor versions are usually similar. Use it in distro_get_param, simplifying the function and making it more powerful. Fix comment to be correct, you can check for scalar/list context if you want, but that's not what this code does.

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)

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

@@ -132 +132 @@
 $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'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd"));
+($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->{'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"));
 
@@ -594 +594 @@
 }
 
+=item B<pb_pbos_to_keylist>
+
+Given a pbos object and the generic key, get the list of possible keys for looking up variable for
+filter names.  The list will be sorted most-specific to least specific.
+
+=cut
+
+sub pb_pbos_to_keylist ($$) {
+
+my ($pbos, $generic) = @_;
+
+foreach my $key (qw/name version arch family type os/) {
+    confess "missing pbos key $key" unless defined $pbos->{$key};
+}
+
+my @keylist = ("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}", "$pbos->{'name'}-$pbos->{'version'}");
+
+# Loop to include also previous minor versions
+# if configured so
+if (($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");
+}
+
+push (@keylist, $pbos->{name}, $pbos->{family}, $pbos->{type}, $pbos->{os}, $generic);
+return @keylist;
+}
+
 =item B<pb_distro_get_param>
 
@@ -603 +635 @@
 
 my @param;
-my $param;
 my $pbos = shift;
 
+my @keylist = pb_pbos_to_keylist($pbos,"default");
 pb_log(2,"DEBUG: pb_distro_get_param on $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} for ".Dumper(@_)."\n");
 foreach my $opt (@_) {
-    if (defined $opt->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) {
-        $param = $opt->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"};
-    } elsif (defined $opt->{"$pbos->{'name'}-$pbos->{'version'}"}) {
-        $param = $opt->{"$pbos->{'name'}-$pbos->{'version'}"};
-    } elsif (defined $opt->{"$pbos->{'name'}"}) {
-        $param = $opt->{"$pbos->{'name'}"};
-    } elsif (defined $opt->{$pbos->{'family'}}) {
-        $param = $opt->{$pbos->{'family'}};
-    } elsif (defined $opt->{$pbos->{'type'}}) {
-        $param = $opt->{$pbos->{'type'}};
-    } elsif (defined $opt->{$pbos->{'os'}}) {
-        $param = $opt->{$pbos->{'os'}};
-    } elsif (defined $opt->{"default"}) {
-        $param = $opt->{"default"};
-    } else {
-        $param = "";
-    }
-
+    my $param = "";
+    foreach my $key (@keylist) {
+        if (defined $opt->{$key}) {
+            $param = $opt->{$key};
+            last;
+        }
+    }
     # Allow replacement of variables inside the parameter such as name, version, arch for rpmbootstrap 
     # but not shell variable which are backslashed
@@ -637 +658 @@
 pb_log(2,"DEBUG: pb_distro_get_param on $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} returns ==".Dumper(@param)."==\n");
 
-# Return one param in scalar context, an array if not.
+# Return one param if user only asked for one lookup, an array if not.
 my $nb = @param;
 if ($nb eq 1) {
-    return($param);
+    return($param[0]);
 } else {
     return(@param);