Changeset 2391 in ProjectBuilder for 0.15.1/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Mar 19, 2019, 1:39:52 AM (5 years ago)

Author:

Bruno Cornec

Message:

Add support for SLES 15 by using /etc/os-release as well and Do not exit if port is undefined for VM in pb_get_port as this may be overwritten later

File:

• 0.15.1/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

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

@@ -280 +280 @@
 # Now look at the os-release file to see if we have a std distribution description
 #
-$r = "/usr/lib/os-release";
-if (-r $r) {
-    my $tmp = pb_get_content("$r");
-    ($release) = $tmp =~ m/.*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n/m;
-    ($distro) = $tmp =~ m/.*\nID=[\"\']*([0-9A-z\._-]+)[\"\']*\n/m;
-    # Remove the leap suffix if present (OpenSUSE)
-    $distro =~ s/-leap//;
-    $found = 1 if ((defined $release) && (defined $distro));
+foreach my $r ("/usr/lib/os-release","/etc/os-release") {
+    if (-r $r) {
+        my $tmp = pb_get_content("$r");
+        ($release) = $tmp =~ m/.*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n/m;
+        ($distro) = $tmp =~ m/.*\nID=[\"\']*([0-9A-z\._-]+)[\"\']*\n/m;
+        # Remove the leap suffix if present (OpenSUSE)
+        $distro =~ s/-leap//;
+        if ((defined $release) && (defined $distro)) {
+            $found = 1;
+            last;
+        }
+    }
 }
 if ($found == 0) {