summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-17 10:29:33 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-17 10:29:33 +0000
commita3925cf8715529397f7ffec7f5818ba5df477a51 (patch)
treeb04fea52064501cb5038079b6f0e2d1d7b891664
parentb34a5a082a4ed026ca51efae6d4c7cc0b375809f (diff)
downloaddrakx-backup-do-not-use-a3925cf8715529397f7ffec7f5818ba5df477a51.tar
drakx-backup-do-not-use-a3925cf8715529397f7ffec7f5818ba5df477a51.tar.gz
drakx-backup-do-not-use-a3925cf8715529397f7ffec7f5818ba5df477a51.tar.bz2
drakx-backup-do-not-use-a3925cf8715529397f7ffec7f5818ba5df477a51.tar.xz
drakx-backup-do-not-use-a3925cf8715529397f7ffec7f5818ba5df477a51.zip
(raw) rename $user as $uid as it really what it is
(preparing for next commit) (backported from trunk)
-rw-r--r--perl-install/run_program.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index 7c0ba92c7..fbc721d82 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -57,11 +57,11 @@ sub raw {
my $home;
if ($options->{as_user}) {
- my $user;
- $user = $ENV{USERHELPER_UID} && getpwuid($ENV{USERHELPER_UID});
- $user ||= common::get_parent_uid();
- $options->{setuid} = getpwnam($user) if $user;
- $home = $user->[7] if $user;
+ my $uid;
+ $uid = $ENV{USERHELPER_UID} && getpwuid($ENV{USERHELPER_UID});
+ $uid ||= common::get_parent_uid();
+ $options->{setuid} = getpwnam($uid) if $uid;
+ $home = $uid->[7] if $uid;
}
local $ENV{HOME} = $home if $home;