Changeset 2182 in ProjectBuilder for devel/pb/bin

Timestamp:

Feb 20, 2017, 7:40:38 AM (8 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.

File:

• devel/pb/bin/pb (modified) (6 diffs)

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 {