Changeset 1181 in ProjectBuilder for devel/rpmbootstrap

Timestamp:

Feb 12, 2011, 1:56:42 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix rpmbootstrap and pb newve order, which wasn't working after the latest pbos introduction
• rpmbootstrap wasn't using the right conf file when launched with sudo is fixed by using the SUDO_USER env. var.
• pb.conf rbsmirrorsrv now uses pbos var, and is filtered correctly.

File:

• devel/rpmbootstrap/bin/rpmbootstrap (modified) (2 diffs)

devel/rpmbootstrap/bin/rpmbootstrap

@@ -230 +230 @@
 
 if (not defined $vepath) {
-    my ($vestdpath) = pb_conf_get_if("vepath");
-    $vepath = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
+    my ($vestdpath) = pb_conf_get("vepath");
+    $vepath = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
 }
 
@@ -242 +242 @@
 #
 my ($rbscachedir) = pb_conf_get_if("rbscachedir");
-my ($pkgs,$mirror) = pb_distro_get_param($pbos->{'name'},$pbos->{'version'},$pbos->{'arch'},pb_conf_get("rbsmindep","rbsmirrorsrv"));
+my ($pkgs,$mirror) = pb_distro_get_param($pbos,pb_conf_get("rbsmindep","rbsmirrorsrv"));
 
 my $cachedir = "/var/cache/rpmbootstrap";