Changeset 620 in ProjectBuilder for devel/pb-modules

Timestamp:

Nov 29, 2008, 7:17:54 PM (16 years ago)

Author:

Bruno Cornec

Message:

• change pb_distro_init interface and add a 6th parameter which is the update CLI to use for that distro.

Location:

devel/pb-modules

Files:

• bin/pbdistrocheck (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (7 diffs)

devel/pb-modules/bin/pbdistrocheck

@@ -28 +28 @@
 pb_log_init($pbdebug, $pbLOG);
 
-my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
-print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
+my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
+print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd))."\n";

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

@@ -73 +73 @@
 my $dtype = "unknown";
 my $dsuf = "unknown";
+my $dupd = "unknown";
 
 # If we don't know which distribution we're on, then guess it
@@ -84 +85 @@
     $dtype="deb";
     $dsuf=".$ddir$dver";
+    $dupd="apt-get -y install ";
 } elsif ($ddir =~ /gentoo/) {
     $dfam="gen";
@@ -89 +91 @@
     $dver="nover";
     $dsuf=".$ddir";
+    $dupd="emerge ";
 } elsif ($ddir =~ /slackware/) {
     $dfam="slack";
@@ -101 +104 @@
     $dtype="rpm";
     $dsuf=".$ddir$dver";
+    $dupd="yast2 -y ";
 } elsif (($ddir =~ /redhat/) ||
         ($ddir =~ /rhel/) ||
@@ -110 +114 @@
     my $dver1 = $dver;
     $dver1 =~ s/\.//;
+
+    # By defaut propose yum
+    my $arch=`uname -m`;
+    my $opt = "";
+    chomp($arch);
+    if ($arch eq "x86_64") {
+        $opt="--exclude=*.i?86";
+    }
+    $dupd="yum -y $opt install ";
     if ($ddir =~ /fedora/) {
         $dsuf=".fc$dver1";
     } elsif ($ddir =~ /redhat/) {
         $dsuf=".rh$dver1";
+        $dupd="unknown";
     } elsif ($ddir =~ /vmware/) {
         $dsuf=".vwm$dver1";
+        $dupd="unknown";
     } else {
+        # older versions of rhel and centos ran up2date
+        if (($dver eq "2.1") || ($dver eq "3") || ($dver eq "4")) {
+            $dupd="up2date -y ";
+        }
         $dsuf=".$ddir$dver1";
     }
@@ -134 +153 @@
         $dsuf=".mdv$dver";
     }
+    $dupd="urpmi --auto ";
 } elsif ($ddir =~ /freebsd/) {
     $dfam="bsd";
@@ -142 +162 @@
 } else {
     $dfam="unknown";
-    $dtype="unknown";
-    $dsuf="unknown";
-}
-
-return($ddir, $dver, $dfam, $dtype, $dsuf);
+}
+
+return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd);
 }