Changeset 2324 in ProjectBuilder

Timestamp:

Sep 24, 2017, 12:09:33 AM (7 years ago)

Author:

Bruno Cornec

Message:

Fix #167 by adding an oslocalins option

Location:

devel

Files:

• pb-modules/etc/pb.yml (modified) (1 diff)
• pb-modules/etc/pb.yml.pod (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/etc/pb.yml

@@ -279 +279 @@
   sol: sudo /usr/sbin/pkgadd -d
   lsb: /bin/true
+
+# On Debian based distro, we can not use apt-get to install local packages just built, so use dpkg
+oslocalins:
+  du: sudo /usr/bin/dpkg -i
+# rpm: sudo /usr/bin/rpm -Uvh
 
 # From the most generic to the most specialized, in term of granularity,

devel/pb-modules/etc/pb.yml.pod

@@ -303 +303 @@
  Nature: Mandatory
  Key: tool (pb or rpmbootstrap)
- Value: come separated list of commands that are mandatory on the underlying system
+ Value: coma separated list of commands that are mandatory on the underlying system
  Conffile: pb
  Example: oscmd pb = tar,ls
@@ -338 +338 @@
  Conffile: pb
  Example: osins fedora = sudo yum -y install
+
+=item B<oslocalins>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: OS command to lauch in order to automatically install local packages on it.
+ Conffile: pb
+ Example: oslocalins debian = sudo dpkg -i 
 
 =item B<osmindep>

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

@@ -165 +165 @@
 $pbos->{'family'} = pb_distro_get_param($pbos,pb_conf_get("osfamily"));
 $pbos->{'type'} = pb_distro_get_param($pbos,pb_conf_get("ostype"));
-($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd"));
+($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'},$pbos->{'localinstall'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd","oslocalins"));
 #($pbos->{'family'},$pbos->{'type'},$pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("osfamily","ostype","os","osins","ossuffix","osnover","osremovedotinver","osupd"));
 
@@ -354 +354 @@
 my $forcerepo = shift;
 my $deps = shift;   # optional list of deps to install
+my $local = shift;   # optional should we install local packages or remote (for deb command is different)
 
 # Protection
@@ -369 +370 @@
 # 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);
 my $ret = pb_system($cmd, "Installing dependencies ($cmd)","mayfail");
 # Try to accomodate deficient proxies

devel/pb/bin/pb

@@ -2116 +2116 @@
     print KEEP "$made\n";
     close(KEEP);
-    pb_distro_installdeps(undef,$pbos,undef,$ret) if ($do_install);
+    pb_distro_installdeps(undef,$pbos,undef,$ret,"local") if ($do_install);
 }