Changeset 735 in ProjectBuilder

Timestamp:

Mar 12, 2009, 1:10:21 AM (16 years ago)

Author:

Bruno Cornec

Message:

• pb now differentiates suse (aka SuSE Professional) and opensuse. Fix original #40

Location:

devel

Files:

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

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

@@ -103 +103 @@
 } elsif (($ddir =~ /suse/) ||
         ($ddir =~ /sles/)) {
-    if ($ddir =~ /opensuse/) {
-        $ddir = "suse";
-    }
     $dfam="novell";
     $dtype="rpm";

devel/pb/bin/pb

@@ -2097 +2097 @@
     print SCRIPT << 'EOF';
 # Suse wants sudoers as 640
-if (($ddir eq "sles") || (($ddir eq "suse")) && ($dver =~ /10.[012]/)) {
+if (($ddir eq "sles") || (($ddir eq "opensuse") && ($dver =~ /10.[012]/))) {
     chmod 0640,$file;
 }
@@ -2210 +2210 @@
     pb_system("$insfb","$cmtfb");
     pb_system("$insms","$cmtms");
-} elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || ($ddir eq "slackware")) {
+} elsif (( $dfam eq "rh" ) || ($ddir eq "suse") || ($ddir eq "sles") || (($ddir eq "opensuse") && (($dver eq "10.1") || ($dver eq "10.0"))) || ($ddir eq "slackware")) {
     # Suppose pkg are installed already as no online mirror available
     pb_system("rpm -e lsb 2>&1 > /dev/null","Removing lsb package");
@@ -2218 +2218 @@
     pb_system("$insfb","$cmtfb");
     pb_system("$insms","$cmtms");
-} elsif ($ddir eq "suse") { 
+} elsif ($ddir eq "opensuse") { 
     # New OpenSuSE
     pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"make wget patch sudo ntp"));