1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[309] revert umask changes</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>309</dd>
<dt>Author</dt> <dd>blino</dd>
<dt>Date</dt> <dd>2011-01-16 23:58:11 +0100 (Sun, 16 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>revert umask changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#build_systemiurttrunkiurt2">build_system/iurt/trunk/iurt2</a></li>
<li><a href="#build_systemiurttrunkiurt_root_command">build_system/iurt/trunk/iurt_root_command</a></li>
</ul>
</div>
<div id="patch"><pre>
<a id="build_systemiurttrunkiurt2">Modified: build_system/iurt/trunk/iurt2</a>
===================================================================
--- 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) {
<a id="build_systemiurttrunkiurt_root_command">Modified: build_system/iurt/trunk/iurt_root_command</a>
===================================================================
--- 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;
}
</pre></div>
</body>
</html>
|
