2006-11-20 Carlos Garnacho <carlosg@gnome.org>

        These changes make it work again for RH derivatives, plenty of thanks
        to Joseph E. Sacco  <joseph_sacco@comcast.net> for providing his YDL
        configuration for testing.

        * Network/Ifaces.pm (get_interface_parse_table): do not use custom
        function to get the interfaces list in RH7.2 derivatives.
        * Utils/Parse.pm (expand): recurse properly in replacement arrays
        * Utils/Platform.pm: Fix regexp for a bunch of ditributions, makes me
        wonder about the distribution of whoever has used s-t-b...

2 files changed, 17 insertions, 17 deletions

diff --git a/Utils/Parse.pm b/Utils/Parse.pm
index 7a8fe03..f9d5b08 100644
--- a/Utils/Parse.pm
+++ b/Utils/Parse.pm
@@ -53,7 +53,7 @@ sub expand
     $strarr = [ @$strarr ];
     foreach $i (@$strarr)
     {
-      $i = &expand ($i, $substr, $value);
+      $i = &expand ($i, @args);
     }
 
     return $strarr;
diff --git a/Utils/Platform.pm b/Utils/Platform.pm
index ad8a226..e5c5cd9 100644
--- a/Utils/Platform.pm
+++ b/Utils/Platform.pm
@@ -361,27 +361,27 @@ sub guess
   my %platform_checks = (
     "Linux"   => [[ \&check_lsb ],
                   [ \&check_distro_file, "/etc/debian_version", "debian", "(.*)", { "testing/unstable" => "sarge" } ],
-                  [ \&check_distro_file, "/etc/SuSE-release", "suse", "VERSION\s*=\s*(\S+)" ],
-                  [ \&check_distro_file, "/etc/blackPanther-release", "blackpanther", "^Linux Black Panther release (\S+)" ],
-                  [ \&check_distro_file, "/etc/blackPanther-release", "blackpanther", "^Black Panther ( L|l)inux release ([\d\.]+)" ],
-                  [ \&check_distro_file, "/etc/vine-release", "vine", "^Vine Linux ([0-9.]+)" ],
-                  [ \&check_distro_file, "/etc/fedora-release", "fedora", "^Fedora Core release (\S+)" ],
-                  [ \&check_distro_file, "/etc/mandrake-release", "mandrake", "^Linux Mandrake release (\S+)" ],
-                  [ \&check_distro_file, "/etc/mandrake-release", "mandrake", "^Mandrake( L|l)inux release ([\d\.]+)" ],
-                  [ \&check_distro_file, "/etc/mandriva-release", "mandriva", "^Linux Mandriva release (\S+)" ],
-                  [ \&check_distro_file, "/etc/mandriva-release", "mandriva", "^Mandriva( L|l)inux release ([\d\.]+)" ],
-                  [ \&check_distro_file, "/etc/conectiva-release", "conectiva", "^Conectiva Linux (\S+)" ],
-                  [ \&check_distro_file, "/etc/redhat-release", "redhat", "^Red Hat Linux.*\s+([0-9.]+)" ],
-                  [ \&check_distro_file, "/etc/openna-release", "openna", "^OpenNA (\S+)" ],
-                  [ \&check_distro_file, "/etc/slackware-version", "slackware", "^Slackware ([0-9.]+)" ],
-                  [ \&check_distro_file, "/etc/vlos-release", "vlos", "^VLOS.*\s+([0-9.]+)" ],
+                  [ \&check_distro_file, "/etc/SuSE-release", "suse", "VERSION\\s*=\\s*(\\S+)" ],
+                  [ \&check_distro_file, "/etc/blackPanther-release", "blackpanther", "^Linux Black Panther release (\\S+)" ],
+                  [ \&check_distro_file, "/etc/blackPanther-release", "blackpanther", "^Black Panther ( L|l)inux release ([\\d\\.]+)" ],
+                  [ \&check_distro_file, "/etc/vine-release", "vine", "^Vine Linux (\\S+)" ],
+                  [ \&check_distro_file, "/etc/fedora-release", "fedora", "^Fedora Core release (\\S+)" ],
+                  [ \&check_distro_file, "/etc/mandrake-release", "mandrake", "^Linux Mandrake release (\\S+)" ],
+                  [ \&check_distro_file, "/etc/mandrake-release", "mandrake", "^Mandrake( L|l)inux release (\\S+)" ],
+                  [ \&check_distro_file, "/etc/mandriva-release", "mandriva", "^Linux Mandriva release (\\S+)" ],
+                  [ \&check_distro_file, "/etc/mandriva-release", "mandriva", "^Mandriva( L|l)inux release (\\S+)" ],
+                  [ \&check_distro_file, "/etc/conectiva-release", "conectiva", "^Conectiva Linux (\\S+)" ],
+                  [ \&check_distro_file, "/etc/redhat-release", "redhat", "^Red Hat Linux.*\\s+(\\S+)" ],
+                  [ \&check_distro_file, "/etc/openna-release", "openna", "^OpenNA (\\S+)" ],
+                  [ \&check_distro_file, "/etc/slackware-version", "slackware", "^Slackware (\\S+)" ],
+                  [ \&check_distro_file, "/etc/vlos-release", "vlos", "^VLOS.*\\s+(\\S+)" ],
                   [ \&check_file_exists, "/usr/portage", "gentoo" ],
-                  [ \&check_distro_file, "/etc/pld-release", "pld", "^([0-9.]+) PLD Linux" ],
+                  [ \&check_distro_file, "/etc/pld-release", "pld", "^(\\S+) PLD Linux" ],
                   [ \&check_rpath ],
                   [ \&check_file_exists, "/etc/arch-release", "archlinux" ],
                   [ \&check_ark ],
                   [ \&check_yoper ],
-                  [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\S+)" ],
+                  [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ],
                  ],
     "FreeBSD" => [[ \&check_freebsd ]],
     "SunOS"   => [[ \&check_solaris ]]