Changeset 2394 in ProjectBuilder

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

Files:

• 0.15.1/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• devel/rpmbootstrap/etc/.pbrc.yml (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;
+            }
         }
     }

devel/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;
+            }
         }
     }

devel/rpmbootstrap/etc/.pbrc.yml

@@ -55 +55 @@
 #velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
 velist:
-  default: centos-6-x86_64,centos-7-x86_64,debian-7-x86_64,debian-8-x86_64,debian-9-x86_64,ubuntu-14.04-x86_64,ubuntu-16.04-x86_64,ubuntu-17.10-x86_64,ubuntu-18.04-x86_64,ubuntu-18.10-x86_64,mageia-3-x86_64,mageia-4-x86_64,mageia-5-x86_64,mageia-6-x86_64,fedora-22-x86_64,fedora-23-x86_64,fedora-24-x86_64,fedora-25-x86_64,fedora-26-x86_64,fedora-27-x86_64,fedora-28-x86_64,fedora-29-x86_64,opensuse-42.1-x86_64,opensuse-42.2-x86_64,opensuse-42.3-x86_64,opensuse-13.2-x86_64,opensuse-15.0-x86_64,opensuse-15.1-x86_64,gentoo-nover-x86_64,alpine-nover-x86_64
+  default: centos-6-x86_64,centos-7-x86_64,debian-7-x86_64,debian-8-x86_64,debian-9-x86_64,ubuntu-14.04-x86_64,ubuntu-16.04-x86_64,ubuntu-17.10-x86_64,ubuntu-18.04-x86_64,ubuntu-18.10-x86_64,mageia-5-x86_64,mageia-6-x86_64,fedora-22-x86_64,fedora-23-x86_64,fedora-24-x86_64,fedora-25-x86_64,fedora-26-x86_64,fedora-27-x86_64,fedora-28-x86_64,fedora-29-x86_64,opensuse-42.1-x86_64,opensuse-42.2-x86_64,opensuse-42.3-x86_64,opensuse-13.2-x86_64,opensuse-15.0-x86_64,opensuse-15.1-x86_64,gentoo-nover-x86_64,alpine-nover-x86_64