diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-05-13 21:05:09 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-05-13 21:05:09 +0000 |
| commit | e7448a4860fd2233d3590119afbd8b9c65fcb225 (patch) | |
| tree | f31471b1c95684e116b2ea0c3c358b2d5c9bd16c | |
| parent | f8fbfa2fe45d7bfa9cce1c2255365dde70f3e696 (diff) | |
| download | urpmi-e7448a4860fd2233d3590119afbd8b9c65fcb225.tar urpmi-e7448a4860fd2233d3590119afbd8b9c65fcb225.tar.gz urpmi-e7448a4860fd2233d3590119afbd8b9c65fcb225.tar.bz2 urpmi-e7448a4860fd2233d3590119afbd8b9c65fcb225.tar.xz urpmi-e7448a4860fd2233d3590119afbd8b9c65fcb225.zip | |
4.3-10mdk
| -rw-r--r-- | urpm.pm | 12 | ||||
| -rw-r--r-- | urpmi.spec | 8 |
2 files changed, 7 insertions, 13 deletions
@@ -2602,17 +2602,7 @@ sub install { } ++$update; } - if (!$options{nodeps} and @l = $trans->check) { - if ($options{translate_message}) { - foreach (@l) { - my ($type, $needs, $conflicts) = split '@', $_; - $_ = ($type eq 'requires' ? - N("%s is needed by %s", $needs, $conflicts) : - N("%s conflicts with %s", $needs, $conflicts)); - } - } - return @l; - } + !$options{nodeps} and @l = $trans->check(%options) and return @l; !$options{noorder} and @l = $trans->order and return @l; #- assume default value for some parameter. @@ -2,14 +2,14 @@ Name: urpmi Version: 4.3 -Release: 9mdk +Release: 10mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate Summary: User mode rpm install URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/urpmi Requires: eject webfetch perl-DateManip >= 5.40 gnupg -PreReq: perl-Locale-gettext >= 1.01-7mdk rpmtools >= 4.3-6mdk perl-URPM >= 0.82-3mdk +PreReq: perl-Locale-gettext >= 1.01-7mdk rpmtools >= 4.3-6mdk perl-URPM >= 0.83-3mdk BuildRequires: bzip2-devel gettext rpm-devel >= 4.0.3 perl-MDK-Common-devel BuildRoot: %{_tmppath}/%{name}-buildroot BuildArch: noarch @@ -202,6 +202,10 @@ $urpm->update_media; %changelog +* Tue May 13 2003 Pons François <fpons@mandrakesoft.com> 4.3-10mdk +- updated to use latest perl-URPM (simplified code, no interface + should be broken). + * Mon May 12 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 4.3-9mdk - internalize grpmi in gurpm.pm so that we can share graphical progression of download and installation between gurpmi and |