Changeset 2360 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Feb 25, 2019, 12:20:25 PM (5 years ago)

Author:

Bruno Cornec

Message:

More opensuse support

• remove os-release management from conf file and do it in code as this

is a generic last resort file we want to look at if nothing else was
found. This is the case for newest opensuse distros

• supports latest opensuse distros

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

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

@@ -257 +257 @@
         # Found one possibility. 
         # Get all distros concerned by that file
-        my $tmp=pb_get_content("$r");
+        my $tmp = pb_get_content("$r");
         my $ptr = $distro_similar->{$d};
         pb_log(2,"amb: ".Dumper($ptr)."\n");
@@ -277 +277 @@
     }
 }
+#
+# 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));
+}
 if ($found == 0) {
     print STDERR "Unable to find a version in ".join(' ',keys %$ambiguous_rel_files)." (ambiguous)\n";
     print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
-    return("unknown","unknown");
+    confess "Please report to the maintainer bruno_at_project-builder.org\n";
 } else {
     return($distro,$release);