Changeset 1181 in ProjectBuilder for devel/pb/lib

Timestamp:

Feb 12, 2011, 1:56:42 AM (14 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/pb/lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/Env.pm

@@ -59 +59 @@
 sub pb_env_init_pbrc {
 
-$ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
+# if sudo, then get the real id of the user laucnhing the context 
+# to point to the right conf file
+# Mandatory for rpmbootstrap calls
+my $dir;
+
+if (defined $ENV{'SUDO_USER'}) {
+    # Home dir is the 8th field in list context
+    $dir = (getpwnam($ENV{'SUDO_USER'}))[7];
+} else {
+    $dir = $ENV{'HOME'};
+}
+
+$ENV{'PBETC'} = "$dir/.pbrc";
 
 if (! -f $ENV{'PBETC'}) {