Changeset 1177 in ProjectBuilder for devel/pb-modules/bin/pbdistrocheck

Timestamp:

Feb 7, 2011, 2:24:17 PM (13 years ago)

Author:

Bruno Cornec

Message:

r4161@eelzbach2: bruno | 2011-02-06 21:07:30 +0100

• Introduction of a new hash $pbos to manage all os related info through a single data structure. All functions reviewed accordingly. Externally transparent, hopefully, but much cleaner code as a consequence. VM/VE/RM remains to be tested.

File:

• devel/pb-modules/bin/pbdistrocheck (modified) (2 diffs)

devel/pb-modules/bin/pbdistrocheck

@@ -118 +118 @@
 
 my $dist = shift @ARGV || undef ;
-my @param = undef;
-@param = split(/-/,$dist) if (defined $dist);
-
-my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init(@param);
+my $pbos = pb_distro_get_context($dist);
 my $sep = "\n";
 if (defined $opts{'l'}) {
@@ -137 +134 @@
     $sep = "," if (defined $opts{'s'});
     if (not defined $opts{'s'}) {
-        $dos = "OS:\t$dos";
-        $ddir = "Name:\t$ddir";
-        $dver = "Ver:\t$dver";
-        $dfam = "Family:\t$dfam";
-        $dtype = "Type:\t$dtype";
-        $pbsuf = "Suffix:\t$pbsuf";
-        $pbupd = "Update:\t$pbupd";
-        $pbins = "Install:\t$pbins";
-        $arch = "Arch:\t$arch";
+        $pbos->{'os'} = "OS:\t$pbos->{'os'}";
+        $pbos->{'name'} = "Name:\t$pbos->{'name'}";
+        $pbos->{'version'} = "Ver:\t$pbos->{'version'}";
+        $pbos->{'family'} = "Family:\t$pbos->{'family'}";
+        $pbos->{'type'} = "Type:\t$pbos->{'type'}";
+        $pbos->{'suffix'} = "Suffix:\t$pbos->{'suffix'}";
+        $pbos->{'update'} = "Update:\t$pbos->{'update'}";
+        $pbos->{'install'} = "Install:\t$pbos->{'install'}";
+        $pbos->{'arch'} = "Arch:\t$pbos->{'arch'}";
         print "Project-Builder tuple:\n";
     }
-    print join($sep,($dos, $ddir, $dver, $arch, $dtype, $dfam, $pbsuf, $pbupd, $pbins))."\n";
+    print join($sep,($pbos->{'os'}, $pbos->{'name'}, $pbos->{'version'}, $pbos->{'arch'}, $pbos->{'type'}, $pbos->{'family'}, $pbos->{'suffix'}, $pbos->{'update'}, $pbos->{'install'}))."\n";
 }