Changeset 622 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Nov 30, 2008, 12:32:47 PM (15 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/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -1944 +1944 @@
     pb_system("yum clean all","Cleaning yum env");
     if ($dver == 4) {
-        pb_system("$pbupd rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker",$cmtall);
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker"));
         pb_system("$insmb","$cmtmb");
         pb_system("$insfm","$cmtfm");
@@ -1951 +1951 @@
         pb_system("$inslg","$cmtlg");
     } else {
-        pb_system("$pbupd rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail",$cmtall);
+        my $addp = "";
         if ($dver > 9) {
-            pb_system("$pbupd perl-gettext",$cmtall);
+            $addp = "perl-gettext";
         } else {
             pb_system("$inslg","$cmtlg");
         }
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail $addp"));
     }
 } elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || ($ddir eq "slackware")) {
@@ -1973 +1974 @@
     pb_system("$insfb","$cmtfb");
     pb_system("$insms","$cmtms");
-    pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail ntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then $pbupd \$liste ; fi","$cmtall");
+    pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail ntp"));
 } elsif ( $dfam eq "md" ) {
-        pb_system("urpmi.update -a ; $pbupd rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail perl-Locale-gettext","$cmtall");
+        my $addp = "";
         if (($ddir eq "mandrake") && ($dver eq "10.1")) {
             pb_system("$insdm","$cmtdm");
             pb_system("$inslg","$cmtlg");
         } else {
-            pb_system("$pbupd perl-DateManip","$cmtdm");
-            pb_system("$pbupd perl-Locale-gettext","$cmtdm");
-        }
+            $addp ="perl-DateManip perl-Locale-gettext";
+        }
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail perl-Locale-gettext $addp"));
 } elsif ( $dfam eq "du" ) {
     if (( $dver eq "3.1" ) && ($ddir eq "debian")) {
-        #system "apt-get update";
         pb_system("$insfb","$cmtfb");
         pb_system("$insfm","$cmtfm");
-        pb_system("apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl","$cmtall");
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl"));
     } else  {
-        pb_system("apt-get update; $pbupd wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl","$cmtall");
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl"));
     }
 } elsif ( $dfam eq "gen" ) {
         #system "emerge -u system";
-        pb_system("$pbupd wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext","$cmtall");
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext"));
 } else {
     pb_log(0,"No pkg to install\n");