diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-dev/attachments/20121029/2f1a9100 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-1be510f9529cb082f802408b472a77d074b394c0.tar archives-1be510f9529cb082f802408b472a77d074b394c0.tar.gz archives-1be510f9529cb082f802408b472a77d074b394c0.tar.bz2 archives-1be510f9529cb082f802408b472a77d074b394c0.tar.xz archives-1be510f9529cb082f802408b472a77d074b394c0.zip | |
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20121029/2f1a9100')
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20121029/2f1a9100/attachment-0001.bin | 26 | ||||
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20121029/2f1a9100/attachment.bin | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20121029/2f1a9100/attachment-0001.bin b/zarb-ml/mageia-dev/attachments/20121029/2f1a9100/attachment-0001.bin new file mode 100644 index 000000000..7796d4ae5 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20121029/2f1a9100/attachment-0001.bin @@ -0,0 +1,26 @@ +Index: urpmi +=================================================================== +--- urpmi (révision 5344) ++++ urpmi (copie de travail) +@@ -266,8 +266,19 @@ + urpm::set_env($urpm, $env); + } else { + if ($< != 0 && !$options{debug__do_not_install}) { +- #- need to be root if binary rpms are to be installed +- $auto_select || @names || @files and $urpm->{fatal}(1, N("Only superuser is allowed to install packages")); ++ if ($no_install) { ++ #- writable download directory needed ++ $urpm->{fatal}( ++ 1, ++ N("Only superuser is allowed to use default download directory") ++ ) if ! $urpm->{options}{'download-all'}; ++ } else { ++ #- root privileges needed to install binary packages ++ $urpm->{fatal}( ++ 1, ++ N("Only superuser is allowed to install packages") ++ ) if $auto_select || @names || @files; ++ } + } + } + diff --git a/zarb-ml/mageia-dev/attachments/20121029/2f1a9100/attachment.bin b/zarb-ml/mageia-dev/attachments/20121029/2f1a9100/attachment.bin new file mode 100644 index 000000000..7796d4ae5 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20121029/2f1a9100/attachment.bin @@ -0,0 +1,26 @@ +Index: urpmi +=================================================================== +--- urpmi (révision 5344) ++++ urpmi (copie de travail) +@@ -266,8 +266,19 @@ + urpm::set_env($urpm, $env); + } else { + if ($< != 0 && !$options{debug__do_not_install}) { +- #- need to be root if binary rpms are to be installed +- $auto_select || @names || @files and $urpm->{fatal}(1, N("Only superuser is allowed to install packages")); ++ if ($no_install) { ++ #- writable download directory needed ++ $urpm->{fatal}( ++ 1, ++ N("Only superuser is allowed to use default download directory") ++ ) if ! $urpm->{options}{'download-all'}; ++ } else { ++ #- root privileges needed to install binary packages ++ $urpm->{fatal}( ++ 1, ++ N("Only superuser is allowed to install packages") ++ ) if $auto_select || @names || @files; ++ } + } + } + |