From 3312aecd9dbd75e3af87e8adfd35687608e9f3e6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 22 Nov 2007 17:07:24 +0000
Subject: do not use $ENV{SUDO_USER} anymore, use user given with --build-user
 (or default to $ENV{USER})

--build-user should become mandatory in the future
---
 iurt2 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'iurt2')

diff --git a/iurt2 b/iurt2
index 7a6ba08..582c34a 100755
--- a/iurt2
+++ b/iurt2
@@ -73,7 +73,7 @@ $run{todo} = [];
 	    [--repository <distribution path>]
  	    {--config_help | --dkms {--media <media regexp>}
 	    --chroot --arch {i586|x86_64|ppc} --distro {cooker|2006.0|community/2006.0|...} } |
- 	    --rebuild {cooker|2006.0|community/2006.0|...} {i586|x86_64|ppc|...} {filename1.src.rpm} {filename2.src.rpm} ... {filenamen.src.rpm} }", 
+ 	    --build-user <user> --rebuild {cooker|2006.0|community/2006.0|...} {i586|x86_64|ppc|...} {filename1.src.rpm} {filename2.src.rpm} ... {filenamen.src.rpm} }", 
     "$program_name is a perl script to rebuild automatically several rpm in chroot, given a sourcerpm repository, and mail authors or rebuilder when problems occurs.
 
 		e.g.: iurt --repository /dis/ -p foo\@foo.net -r cooker x86_64  /SRPMS/main/release/mkcd-4.2.5-1mdv2007.1.src.rpm", 
@@ -183,6 +183,9 @@ $run{todo} = [];
     [ "p", "packager", 1, "<packager>", 
     "Use a specific packager",
     sub { ($run{packager}) = @_ }, 'Setting packager tag'], 
+    [ "", "build-user", 1, "<user>", 
+    "Use this username to build package",
+    sub { ($run{user}) = @_ }, 'Setting build username'], 
     [ "r", "rebuild", -2, "<distro> <architecture> <srpm 1> <srpm 2> ... <srpm n>", 
     "Rebuild the packages, e.g. $program_name -r cooker x86_64 /home/foo/rpm/SRPMS/foo-2.3-12mdv2007.0.src.rpm", 
     sub { 
@@ -648,7 +651,7 @@ if ($run{use_cache}) {
 }
 $run{daydate} = $daydate;
 plog('DEBUG', "using $run{run} as chroot extension");
-$run{user} = $ENV{SUDO_USER} || $ENV{USER};
+$run{user} ||= $ENV{USER};
 die "Iurt should not be executed as root." if $run{user} == "root";
 $run{uid} = getpwnam $run{user};
 
-- 
cgit v1.2.1