Changeset 2182 in ProjectBuilder

Timestamp:

Feb 20, 2017, 7:40:38 AM (7 years ago)

Author:

Bruno Cornec

Message:

Solve an issue with dependency optimization

When adding a new repo, we may have some packages which are updates from
already installed packages. In order for them to be updated, we need to
invalidate the optimisation computed on the deps so that all packages are
analyzed again, not just te one not installed yet.
This requires a modification of the interface of the functions
pb_distro_installdeps and pb_distro_getdeps so that they support a new
forcedep parameter which trigger the full analyze vs the optimized one.
This fix is mandatory for python-redfish package build on Mageia 5.

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (10 diffs)
• pb/bin/pb (modified) (6 diffs)

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

@@ -331 +331 @@
 
 This function install the dependencies required to build the package on a distro.
-Dependencies can be passed as a parameter in which case they are not computed
+If $forcerepo is defined then do not assumer package are alredy installed, but reinstall them
+(useful if you add a repo which contains more up to date packages that you need)
+Dependencies can be passed as the 4th parameter in which case they are not computed
 
 =cut
@@ -340 +342 @@
 my $f = shift;
 my $pbos = shift;
-my $deps = shift;
+my $forcerepo = shift;
+my $deps = shift;   # optional list of deps to install
 
 # Protection
 confess "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
 pb_apply_conf_proxy($pbos);
-
-# Get dependencies in the build file if not forced
-$deps = pb_distro_getdeps($f,$pbos) if (not defined $deps);
 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});
+
+# Get dependencies in the build file if not forced
+$deps = pb_distro_getdeps($f,$pbos, $forcerepo) if ((not defined $deps) || (defined $forcerepo));
 pb_log(2,"deps: $deps\n");
 return if ((not defined $deps) || ($deps =~ /^\s*$/));
@@ -361 +364 @@
 }
 # Check that all deps have been installed correctly
-$deps = pb_distro_getdeps($f, $pbos);
+$deps = pb_distro_getdeps($f, $pbos, $forcerepo);
 confess "Some dependencies did not install ($deps)" if ((defined $deps) && ($deps =~ /\S/) && ($Global::pb_stop_on_error));
 }
@@ -375 +378 @@
 my $f = shift;
 my $pbos = shift;
+my $forcerepo = shift;
 
 my $regexp = "";
@@ -453 +457 @@
 $/ = $oldsep;
 pb_log(2,"now deps: $deps\n");
-my $deps2 = pb_distro_only_deps_needed($pbos,$deps);
-return($deps2);
+if (defined $forcerepo) {
+    # We want to force installation of all pkgs
+    # because a repo was setup in between, which may contains updated versions
+    pb_log(0,"Forcing installation of all packages due to previous repo setup\n");
+    return($deps);
+} else {
+    pb_log(0,"Installation of only necessary packages\n");
+    my $deps2 = pb_distro_only_deps_needed($pbos,$deps);
+    return($deps2);
+}
 }
 
@@ -516 +528 @@
 my $pbos = shift;
 
-pb_distro_setuprepo_gen($pbos,pb_distro_conffile(),"osrepo");
+return(pb_distro_setuprepo_gen($pbos,pb_distro_conffile(),"osrepo"));
 }
 
@@ -529 +541 @@
 my $pbos = shift;
 
-pb_distro_setuprepo_gen($pbos,"$ENV{'PBDESTDIR'}/pbrc","addrepo");
+return(pb_distro_setuprepo_gen($pbos,"$ENV{'PBDESTDIR'}/pbrc","addrepo"));
 }
 
@@ -566 +578 @@
 my $pbkey = shift;
 
-return if (not defined $pbconf);
-return if (not defined $pbkey);
+return undef if (not defined $pbconf);
+return undef if (not defined $pbkey);
 my ($addrepo) = pb_conf_read($pbconf,$pbkey);
-return if (not defined $addrepo);
+return undef if (not defined $addrepo);
 
 my $param = pb_distro_get_param($pbos,$addrepo);
-return if ($param eq "");
+return undef if ($param eq "");
 
 pb_apply_conf_proxy($pbos);
@@ -615 +627 @@
             }
             my $dest = "$dirdest/$bn";
-            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
+            return undef if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
             confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dest","Adding $reponame repository") if (not -f "$dest");
@@ -657 +669 @@
     }
 }
-return;
+return("forcerepo");
 }
 

devel/pb/bin/pb

@@ -1603 +1603 @@
 
     # Additional potential repo
-    pb_distro_setuprepo($pbos);
+    my $forcerepo = pb_distro_setuprepo($pbos);
     foreach my $pbpkg (@pkgs) {
         # We need to install the package to test, and deps brought with it
-        pb_distro_installdeps(undef,$pbos,$pbpkg);
+        pb_distro_installdeps(undef,$pbos,$forcerepo,$pbpkg);
         pb_system("$ENV{'PBDESTDIR'}/pbtest","Launching test for $pbpkg","verbose");
     }
@@ -1619 +1619 @@
 
     # If needed we may add repository to the build env
-    pb_distro_setuprepo($pbos);
+    my $forcerepo = pb_distro_setuprepo($pbos);
+    pb_log(1,"Forcing full package install with forcerepo\n") if (defined $forcerepo);
 
     # Get list of packages to build
@@ -1662 +1663 @@
         foreach my $f (@buildfiles) {
             if ($f =~ /$ftype/) {
-                pb_distro_installdeps($f,$pbos);
+                pb_distro_installdeps($f,$pbos,$forcerepo);
             }
         }
@@ -2070 +2071 @@
     print KEEP "$made\n";
     close(KEEP);
-    pb_distro_installdeps(undef,$pbos,$ret) if ($do_install);
+    pb_distro_installdeps(undef,$pbos,undef,$ret) if ($do_install);
 }
 
@@ -3913 +3914 @@
     
 my $pkgdep = pb_distro_get_param($pbos,$ospkgdep);
-pb_distro_installdeps(undef,$pbos,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgdep))));
+pb_distro_installdeps(undef,$pbos,undef,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgdep))));
 
 EOF
@@ -3972 +3973 @@
         print SCRIPT << 'EOF';
 my $pkgforpb = pb_distro_get_param($pbos,pb_conf_get_if("ospkg"));
-pb_distro_setuposrepo($pbos);
-pb_distro_installdeps(undef,$pbos,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgforpb))));
+my $forcerepo = pb_distro_setuposrepo($pbos);
+pb_log(1,"Forcing full package install with forcerepo\n") if (defined $forcerepo);
+pb_distro_installdeps(undef,$pbos,$forcerepo,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgforpb))));
 EOF
     } else {