Changeset 622 in ProjectBuilder for devel/pb-modules

Timestamp:

Nov 30, 2008, 12:32:47 PM (16 years ago)

Author:

Bruno Cornec

Message:

• pb now uses pb_distro_installdeps in VM/VE setup
• pb_get_distro => pb_distro_get for homogeneity
• before installing packages, call the update of the pkg db before (may create issues, but is generally better)
• Adds pb_distro_only_deps_needed to compute the packages in a list whose installation is really needed

File:

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

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

@@ -20 +20 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_init pb_get_distro pb_distro_installdeps);
+our @EXPORT = qw(pb_distro_init pb_distro_get pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed);
 
 =pod
@@ -49 +49 @@
   # Return information on the running distro
   #
-  my ($ddir,$dver) = pb_get_distro();
+  my ($ddir,$dver) = pb_distro_get();
   my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($ddir,$dver);
   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd)."\n";
@@ -58 +58 @@
 
 
-=item B<pb_get_distro>
+=item B<pb_distro_get>
 
 This function returns a list of 2 parameters indicating the distribution name and version of the underlying Linux distribution. The value of those 2 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
@@ -76 +76 @@
 
 # If we don't know which distribution we're on, then guess it
-($ddir,$dver) = pb_get_distro() if ((not defined $ddir) || (not defined $dver));
+($ddir,$dver) = pb_distro_get() if ((not defined $ddir) || (not defined $dver));
 
 # There should be unicity of names between ddir dfam and dtype
@@ -85 +85 @@
     $dtype="deb";
     $dsuf=".$ddir$dver";
-    $dupd="apt-get -y install ";
+    # Chaining the commands allow to only test for what is able o be installed, 
+    # not the update of the repo which may well be unaccessible if too old
+    $dupd="sudo apt-get update ; sudo apt-get -y install ";
 } elsif ($ddir =~ /gentoo/) {
     $dfam="gen";
@@ -91 +93 @@
     $dver="nover";
     $dsuf=".$ddir";
-    $dupd="emerge ";
+    $dupd="sudo emerge ";
 } elsif ($ddir =~ /slackware/) {
     $dfam="slack";
@@ -104 +106 @@
     $dtype="rpm";
     $dsuf=".$ddir$dver";
-    $dupd="yast2 -y ";
+    $dupd="export TERM=linux ; sudo yast2 -y ";
 } elsif (($ddir =~ /redhat/) ||
         ($ddir =~ /rhel/) ||
@@ -122 +124 @@
         $opt="--exclude=*.i?86";
     }
-    $dupd="yum -y $opt install ";
+    $dupd="sudo yum clean all; sudo yum update ; sudo yum -y $opt install ";
     if ($ddir =~ /fedora/) {
         $dsuf=".fc$dver1";
@@ -134 +136 @@
         # older versions of rhel and centos ran up2date
         if (($dver eq "2.1") || ($dver eq "3") || ($dver eq "4")) {
-            $dupd="up2date -y ";
+            $dupd="sudo up2date -y ";
         }
         $dsuf=".$ddir$dver1";
@@ -153 +155 @@
         $dsuf=".mdv$dver";
     }
-    $dupd="urpmi --auto ";
+    # Chaining the commands allow to only test for what is able o be installed, 
+    # not the update of the repo which may well be unaccessible if too old
+    $dupd="sudo urpmi.update -a ; sudo urpmi --auto ";
 } elsif ($ddir =~ /freebsd/) {
     $dfam="bsd";
@@ -164 +168 @@
 }
 
-# Update command needs to be run by root
-$dupd = "sudo ".$dupd;
-
 return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd);
 }
@@ -185 +186 @@
 =cut
 
-sub pb_get_distro {
+sub pb_distro_get {
 
 my $base="/etc";
@@ -381 +382 @@
 pb_log(3,"entering pb_distro_getdeps: $dtype - $f\n");
 # Protection
-return if (not defined $dtype);
+return("") if (not defined $dtype);
 if ($dtype eq  "rpm") {
     # In RPM this could include files, but we do not handle them atm.
@@ -392 +393 @@
 } else {
     # No idea
-    return;
+    return("");
 }
 pb_log(2,"regexp: $regexp\n");
@@ -398 +399 @@
 
 # Protection
-return if (not defined $f);
+return("") if (not defined $f);
 
 # Preserve separator before using the one we need
@@ -423 +424 @@
 $/ = $oldsep;
 pb_log(2,"now deps: $deps\n");
+my $deps2 = pb_distro_only_deps_needed($dtype,$deps);
+return($deps2);
+}
+
+
+=over 4
+
+=item B<pb_distro_only_deps_needed>
+
+This function returns only the dependencies not yet installed
+
+=cut
+
+sub pb_distro_only_deps_needed {
+
+my $deps = shift || undef;
+my $dtype = shift || undef;
+
 my $deps2 = "";
-
 # Avoid to install what is already there
 foreach my $p (split(/ /,$deps)) {