Changeset 2427 in ProjectBuilder for devel

Timestamp:

Sep 1, 2019, 6:16:11 PM (6 years ago)

Author:

Bruno Cornec

Message:

Improve install2pkg when repo already configured and use the new pb_distro_installpkgs function

Location:

devel

Files:

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

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

@@ -33 +33 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_api pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_setuprepo_gen pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
+our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_api pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_installpkgs pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_setuprepo_gen pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
 ($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
 
@@ -370 +370 @@
 }
 
+=item B<pb_distro_installpkgs>
+
+This function install the packages passed as parameters on a distribution.
+
+=cut
+
+sub pb_distro_installpkgs {
+
+my $pbos = shift;
+my $pkgs = shift;    # list of pkgs to install
+my $local = shift;   # optional should we install local packages or remote (for deb command is different)
+
+# Protection
+confess "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
+pb_apply_conf_proxy($pbos);
+pb_log(1, "ftp_proxy=$ENV{'ftp_proxy'}\n") if (defined $ENV{'ftp_proxy'});
+pb_log(1, "http_proxy=$ENV{'http_proxy'}\n")  if (defined $ENV{'http_proxy'});
+pb_log(1, "https_proxy=$ENV{'https_proxy'}\n")  if (defined $ENV{'https_proxy'});
+
+# This may not be // proof. We should test for availability of repo and sleep if not
+my $cmd = "$pbos->{'install'} $pkgs";
+$cmd = "$pbos->{'localinstall'} $pkgs" if ((defined $local) && (defined $pbos->{'localinstall'}) && ($pbos->{'localinstall'} !~ /[ ]*/));
+my $ret = pb_system($cmd, "Installing packages ($cmd)","mayfail");
+# Try to accomodate deficient proxies
+if ($ret != 0) {
+    $ret = pb_system($cmd, "Re-trying installing packages ($cmd)");
+}
+confess "Some packages did not install" if (($ret != 0) && ($Global::pb_stop_on_error));
+}
+
+
 =item B<pb_distro_installdeps>
 
@@ -388 +419 @@
 my $local = shift;   # optional should we install local packages or remote (for deb command is different)
 
-# Protection
-confess "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
-pb_apply_conf_proxy($pbos);
-pb_log(1, "ftp_proxy=$ENV{'ftp_proxy'}\n") if (defined $ENV{'ftp_proxy'});
-pb_log(1, "http_proxy=$ENV{'http_proxy'}\n")  if (defined $ENV{'http_proxy'});
-pb_log(1, "https_proxy=$ENV{'https_proxy'}\n")  if (defined $ENV{'https_proxy'});
-
 # Get dependencies in the build file if not forced
 $deps = pb_distro_getdeps($f,$pbos, $forcerepo) if ((not defined $deps) || (defined $forcerepo));
@@ -400 +424 @@
 return if ((not defined $deps) || ($deps =~ /^\s*$/));
 
-# This may not be // proof. We should test for availability of repo and sleep if not
-my $cmd = "$pbos->{'install'} $deps";
-$cmd = "$pbos->{'localinstall'} $deps" if ((defined $local) && (defined $pbos->{'localinstall'}) && ($pbos->{'localinstall'} !~ /[ ]*/));
-my $ret = pb_system($cmd, "Installing dependencies ($cmd)","mayfail");
-# Try to accomodate deficient proxies
-if ($ret != 0) {
-    pb_system($cmd, "Re-trying installing dependencies ($cmd)");
-}
+pb_distro_installpkgs($pbos,$deps,$local);
 # Check that all deps have been installed correctly
 # This time we don't forcerepo to avoid getting a list as a return as we have
@@ -637 +654 @@
     if ((not defined $addrepo) || (not defined $addrepo->{$ENV{'PBPROJ'}})) {
         my ($pbrepo) = pb_conf_get_in_hash_if($h,"pbrepo");
-        return undef if (not defined $pbrepo);
+        return(undef) if (not defined $pbrepo);
         my $url = "$pbrepo->{$ENV{'PBPROJ'}}";
         my ($testver,$delivery) = pb_conf_get_in_hash_if($h,"testver","delivery");
@@ -677 +694 @@
 my $param = shift;
 
-return if (not defined $param);
+return(undef) if (not defined $param);
 
 pb_apply_conf_proxy($pbos);
@@ -721 +738 @@
             }
             my $dest = "$dirdest/$bn";
-            return undef if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
+            return(undef) if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
             if (! -d $dirdest) {
                 cluck "Missing directory $dirdest ($reponame)";
-                return undef;
+                return(undef);
             }
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dest","Adding $reponame repository") if (not -f "$dest");
@@ -748 +765 @@
         } elsif ($bn =~ /\.addmedia/) {
             # URPMI repo
-            # We should test that it's not already a urpmi repo
-            pb_system("chmod 755 $ENV{'PBTMP'}/$bn ; sudo $ENV{'PBTMP'}/$bn 2>&1 > /dev/null","Adding urpmi repository");
+            # We should test that it's not an already setup urpmi repo
+            open(URPMI,"/etc/urpmi/urpmi.cfg") || cluck "Unable to open /etc/urpmi/urpmi.cfg" && next;
+            my $found = 0;
+            my $entry = $bn;
+            $entry =~ s/.addmedia$//;
+            while (<URPMI>) {
+                $found = 1 if ($_ =~ /^$entry /);
+            }
+            pb_system("chmod 755 $ENV{'PBTMP'}/$bn ; sudo $ENV{'PBTMP'}/$bn 2>&1 > /dev/null","Adding urpmi repository") if ($found == 0);
+            pb_log(0,"INFO urpmi $bn already set up\n") if ($found == 1);
         } else {
             pb_log(0,"ERROR: Unable to deal with repository file $i on rpm distro ! Please report to dev team\n");
@@ -756 +781 @@
         if ($bn =~ /\.sources.list$/) {
             my $dest = "/etc/apt/sources.list.d/$bn";
-            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
+            return(undef) if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dest","Adding apt repository $dest");
             # Check whether GPG keys for this repo are already known and if
@@ -771 +796 @@
             }
             close(REPO);
-            return if (not defined $debrepo);
+            return(undef) if (not defined $debrepo);
 
             pb_system("wget -O $ENV{'PBTMP'}/Release $debrepo/Release","Downloading $debrepo/Release");
@@ -792 +817 @@
             }
             close(SIGN);
-            return if (not defined $signature);
+            return(undef) if (not defined $signature);
 
             pb_log(3, "GnuPG repo verify returned: $signature\n");

devel/pb/bin/pb

@@ -1678 +1678 @@
 
     # Additional potential repo
-    my $forcerepo = pb_distro_setuprepo($pbos,"install");
+    pb_distro_setuprepo($pbos,"install");
     foreach my $pbpkg (@pkgs) {
         # We need to install the package to test, and deps brought with it
-        pb_distro_installdeps(undef,$pbos,$forcerepo,$pbpkg,"local");
+        pb_distro_installpkgs($pbos,$pbpkg,"local");
     }
 }
@@ -1697 +1697 @@
     my $forcerepo = pb_distro_setuprepo($pbos,"test");
     foreach my $pbpkg (@pkgs) {
-        # We need to install the package to test, and deps brought with it
-        pb_distro_installdeps(undef,$pbos,$forcerepo,$pbpkg);
-        pb_system("$ENV{'PBDESTDIR'}/pbtest","Launching test for $pbpkg","verbose");
-    }
+    }
+    pb_system("$ENV{'PBDESTDIR'}/pbtest","Launching test","verbose");
 }
 
@@ -2720 +2718 @@
                 $tag{2} = "$tag{1}-pb";
                 $tag{3} = "$tag{2}-$ENV{'PBPROJ'}";
-                $tag{4} = "$tag{3}-install";
-                $tag{5} = "$tag{3}-test";
+                $tag{4} = "$tag{2}-install";
+                $tag{5} = "$tag{2}-test";
             } else {
                 # If we were given an image name, just use it