Changeset 24

Timestamp:

07/31/07 20:00:18 (6 years ago)

Author:

bruno

Message:

get_distro begins to work

File:

• devel/pb/lib/distro.pm (modified) (6 diffs)

devel/pb/lib/distro.pm

@@ -138 +138 @@
 # If ambiguity, which other distributions should be checked
 my %distro_similar = (
-    'mandrake'          => ('mandrake'),
-    'suse'              => ('suse', 'sles'),
-    'redhat'            => ('redhat', 'rhel', 'centos', 'mandrake'),
-    'lsb'               => ('ubuntu', 'debian', 'lsb')
-    )
+    'mandrake'          => ['mandrake'],
+    'suse'              => ['suse', 'sles'],
+    'redhat'            => ['redhat', 'rhel', 'centos', 'mandrake'],
+    'lsb'               => ['ubuntu', 'debian', 'lsb'],
+    );
 
 my %distro_match = (
@@ -148 +148 @@
     'gentoo'                => '.* version (.+)',
     'debian'                => '([^/]+)[/]*.*',
-    'slackware'             => '[^ ]* (.+) [^ ]*',
+    'slackware'             => 'S[^ ]* (.+)$',
 # There should be no ambiguity between potential ambiguous distro
-    'mandrake'              => 'Mandr[^ ]* release (.+) .*',
-    'mandriva'              => 'Mandr[^ ]* [^ ]* release (.+) .*',
-    'fedora'                => 'Fedora .*release (\d+) .*',
-    'rhel'                  => '.* Enterprise .*release (.+) \(',
-    'centos'                => '.*CentOS .*release (.+) .*',
-    'redhat'                => 'Red Hat Linux release (.+) .*',
+    'mandrake'              => 'Mandr[^ ]* release (.+) \(',
+    'mandriva'              => 'Mandr[^ ]* [^ ]* release (.+) \(',
+    'fedora'                => 'Fedora .*release (\d+) \(',
+    'rhel'                  => 'Red Hat Enterprise Linux .*release (.+) \(',
+    'centos'                => '.*CentOS .*release (.+) ',
+    'redhat'                => 'Red Hat Linux release (.+) \(',
     'sles'                  => '.* Enterprise .*\nVERSION = (.+)',
     'suse'                  => '.* [^Enterpis] .*\nVERSION = (.+)',
@@ -170 +170 @@
 # Begin to test presence of non-amiguous files
 # that way we reduce the choice
-while (my ($d,$r) each %single_rel_files) {
-    if (-f "$base/$r" && !-l "$base/$r"){
-        $release=get_content("$base/$r");
+my ($d,$r);
+while (($d,$r) = each %single_rel_files) {
+    if (-f "$base/$r" && !-l "$base/$r") {
+        my $tmp=get_content("$base/$r");
         # Found the only possibility. 
         # Try to get version and return
-        if (defined ($distro_match{$d}) {
-            $release =~ m/$distro_match{$d}/m;
+        if (defined ($distro_match{$d})) {
+            ($release) = $tmp =~ m/$distro_match{$d}/m;
         } else {
-            print STDERR "Unable to find $d's version in $r\n";
+            print STDERR "Unable to find $d version in $r\n";
             print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
             $release = "unknown";
@@ -186 +187 @@
 }
 
-while (my ($d,$r) each %ambiguous_rel_files) {
+while (($d,$r) = each %ambiguous_rel_files) {
     if (-f "$base/$r" && !-l "$base/$r"){
         # Found one possibility. 
         # Get all distros concerned by that file
-        $release=get_content("$base/$r");
-        $found = 0;
-        foreach $dd (@$distro_similar{$d}) {
+        my $tmp=get_content("$base/$r");
+        my $found = 0;
+        my $ptr = $distro_similar{$d};
+        print $LOG "amb: ".Dumper($ptr)."\n" if ($debug >= 1);
+        $release = "unknown";
+        foreach my $dd (@$ptr) {
+            print $LOG "check $dd\n" if ($debug >= 1);
             # Try to check pattern
-            if ((defined ($distro_match{$dd}) && ($release =~ /$distro_match{$dd}/m) {
-                $release =~ m/$distro_match{$dd}/m;
-                $distro = $dd;
-                $found = 1;
+            if (defined $distro_match{$dd}) {
+                print $LOG "cmp: $distro_match{$dd} - vs - $tmp\n" if ($debug >= 1);
+                ($release) = $tmp =~ m/$distro_match{$dd}/m;
+                if ((defined $release) && ($release ne "unknown")) {
+                    $distro = $dd;
+                    $found = 1;
+                    last;
+                }
             }
         }
         if ($found == 0) {
-            print STDERR "Unable to find $d's version in $r\n";
+            print STDERR "Unable to find $d version in $r\n";
             print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
             $release = "unknown";
@@ -210 +219 @@
 }
 return("unknown","unknown");
+}
 
 sub get_content {
@@ -220 +230 @@
 my $content=<R>;
 close(R);
+chomp($content);
 $/ = $bkp;
 return($content);