Changeset 2391 in ProjectBuilder

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

Location:

0.15.1

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb/bin/pb (modified) (2 diffs)

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) {

0.15.1/pb/bin/pb

@@ -1041 +1041 @@
     pb_log(0, "and that it allows remote root login (PermitRootLogin yes in /etc/ssh/sshd_config)\n");
     pb_log(0, "Also ensure that network is up, firewalling correctly configured\n");
-    pb_log(0, "and perl, Data::Dumper, tar, sudo, ntpdate and scp/ssh installed\n");
+    pb_log(0, "and perl-YAML, perl-Date-Manip, tar, sudo, ntpdate, make and scp/ssh installed\n");
     pb_log(0, "You should then be able to login with ssh -p VMPORT root\@localhost (if VM started with pb)\n");
 } elsif ($action =~ /^setuprm$/) {
@@ -5050 +5050 @@
 # key is project on VM, but machine tuple for RM
 if ($cmt =~ /^RM/i) {
-    die "No port passed in parameter. You may miss a config file. Report to dev team\n" if (not defined $port->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"});
+    die "No port passed in parameter. You may miss a RM config file. Report to dev team\n" if (not defined $port->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"});
     $nport = $port->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"};
 } else {
-    die "No port passed in parameter. You may miss a config file. Report to dev team\n" if (not defined $port->{'PBPROJ'});
+    die "No port passed in parameter. You may miss a VE config file or a vmport entry for $ENV{'PBPROJ'}. Report to dev team\n" if ((not defined $port->{'PBPROJ'}) and ($cmt =~ /^VE/i));
     $nport = $port->{$ENV{'PBPROJ'}};
 }
-pb_log(2,"pb_get_port with $nport\n");
+pb_log(2,"pb_get_port with $nport\n") if (defined $nport);
 if ($cmt =~ /^VM/i) {
     # Maybe a port was given as parameter so overwrite