[Mageia-sysadm] [309] revert umask changes
root at mageia.org
root at mageia.org
Sun Jan 16 23:58:11 CET 2011
Revision: 309
Author: blino
Date: 2011-01-16 23:58:11 +0100 (Sun, 16 Jan 2011)
Log Message:
-----------
revert umask changes
Modified Paths:
--------------
build_system/iurt/trunk/iurt2
build_system/iurt/trunk/iurt_root_command
Modified: build_system/iurt/trunk/iurt2
===================================================================
--- build_system/iurt/trunk/iurt2 2011-01-16 22:37:25 UTC (rev 308)
+++ build_system/iurt/trunk/iurt2 2011-01-16 22:58:11 UTC (rev 309)
@@ -1454,7 +1454,7 @@
close $f;
plog("adding sudo for /bin/rpm, /usr/sbin/urpmi and /usr/sbin/urpme");
- my $ret = sudo($run, $config, '--cp', '--umask', 0337, $tmpfile, $file);
+ my $ret = sudo($run, $config, '--cp', $tmpfile, $file);
unlink $tmpfile;
if (!$ret) {
Modified: build_system/iurt/trunk/iurt_root_command
===================================================================
--- build_system/iurt/trunk/iurt_root_command 2011-01-16 22:37:25 UTC (rev 308)
+++ build_system/iurt/trunk/iurt_root_command 2011-01-16 22:58:11 UTC (rev 309)
@@ -49,7 +49,7 @@
"$program_name is a perl script to execute commands which need root privilege, it helps probram which needs occasional root privileges for some commands.",
sub { $arg or usage($program_name, \@params) }, "Running $program_name" ],
[ "", "cp", [
- ["", "cp", -1, "[-r] [-u <umask>] <file1> <file2> ... <filen> <dest>", "copy the files to dest",
+ ["", "cp", -1, "[-r] <file1> <file2> ... <filen> <dest>", "copy the files to dest",
sub {
my ($tmp, @arg) = @_;
$tmp->[0] ||= {};
@@ -59,10 +59,7 @@
["r", "recursive", 0, "",
"Also copy directories and subdirectories",
sub { my ($tmp) = @_; $tmp->[0]{recursive} = 1; 1 }, "Set the recursive flag"],
- [ "u", "umask", 1, "<umask>",
- "Set the umask",
- sub { my ($tmp) = @_; ($tmp->[0]{umask}) = @_; 1 }, "Setting umask" ],
- ], "[-r] [-u <umask>] <file1> <file2> ... <filen> <dest>",
+ ], "[-r] <file1> <file2> ... <filen> <dest>",
"Copy files",
\&cp, "Copying files" ],
[ "", "ln", [
@@ -297,10 +294,6 @@
plog('FAIL', "copying to $dest forbidden");
return;
}
-
- my $prev_umask = umask();
- umask($prev_umask | $opt->{umask}) if $opt->{umask};
-
foreach my $f (@files) {
if (-d $f) {
if (!$opt->{recursive}) {
@@ -333,9 +326,6 @@
}
}
}
-
- umask($prev_umask) if $opt->{umask};
-
if (!$done) { plog('DEBUG', "nothing copied") }
$ok;
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110116/d0de823a/attachment.html>
More information about the Mageia-sysadm
mailing list