From b9d2b09db2fa1a75a7806851e836fd43d3fa1275 Mon Sep 17 00:00:00 2001
From: Olivier Blin <blino@mageia.org>
Date: Tue, 2 Nov 2010 06:34:10 +0000
Subject: use iurt_root_command --cp to write rpmmacros file

---
 lib/Iurt/Chroot.pm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 91ff0f1..8148169 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -149,8 +149,9 @@ sub dump_rpmmacros {
 
     #plog("adding rpmmacros to $file");
 
-    if (!open $f, qq(| $sudo sh -c "cat > $file")) {
-	plog("ERROR: could not open $file ($!)");
+    my $tmpfile = "/tmp/rpmmacros";
+    if (!open $f, ">$tmpfile") {
+	plog("ERROR: could not open $tmpfile ($!)");
 	return 0;
     }
     my $packager = $run->{packager} || $config->{packager};
@@ -160,7 +161,16 @@ sub dump_rpmmacros {
 \%distribution           $config->{distribution}
 \%vendor                 $config->{vendor}
 \%packager               $packager);
-    # need to be root for permission
+
+    my $ret = sudo($run, $config, '--cp', $tmpfile, $file);
+    unlink $tmpfile;
+
+    if (!$ret) {
+	plog("ERROR: could not write $file ($!)");
+	return 0;
+    }
+
+    1;
 }
 
 sub add_local_user {
-- 
cgit v1.2.1