Changeset 2394 in ProjectBuilder for 0.15.1

Timestamp:

Mar 19, 2019, 4:22:56 PM (5 years ago)

Author:

Bruno Cornec

Message:

Do not consider os-release files when another was found earlier

File:

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

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

@@ -277 +277 @@
     }
 }
-#
-# Now look at the os-release file to see if we have a std distribution description
-#
-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) {
+    #
+    # Now look at the os-release file to see if we have a std distribution description
+    #
+    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;
+            }
         }
     }