summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-12-11 15:32:02 +0000
committerFrancois Pons <fpons@mandriva.com>2002-12-11 15:32:02 +0000
commitc5cc0b8598842c3fed2db1797473c9931eeaad31 (patch)
tree8f004f6efc620a41918893c30512fef7fd007f36
parentd75e00d8f4ec0583bc5a5e3152fd4fbe140779e7 (diff)
downloadurpmi-c5cc0b8598842c3fed2db1797473c9931eeaad31.tar
urpmi-c5cc0b8598842c3fed2db1797473c9931eeaad31.tar.gz
urpmi-c5cc0b8598842c3fed2db1797473c9931eeaad31.tar.bz2
urpmi-c5cc0b8598842c3fed2db1797473c9931eeaad31.tar.xz
urpmi-c5cc0b8598842c3fed2db1797473c9931eeaad31.zip
4.1-14mdk
-rw-r--r--urpm.pm2
-rwxr-xr-xurpmf7
-rw-r--r--urpmi.spec8
3 files changed, 13 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 18133456..1b709af9 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1652,7 +1652,7 @@ sub search_packages {
}
}
- if ($options{use_provides}) {
+ if ($options{use_provides} && $options{fuzzy}) {
foreach (keys %{$urpm->{provides}}) {
#- search through provides to find if a provide match this one.
#- but manages choices correctly (as a provides may be virtual or
diff --git a/urpmf b/urpmf
index cdd1ed92..a36a8928 100755
--- a/urpmf
+++ b/urpmf
@@ -49,6 +49,7 @@ usage:
") . _(" --conflicts - print tag conflicts: all conflicts (multiple lines).
") . _(" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).
") . _(" --prereqs - print tag prereqs: all prereqs (multiple lines).
+") . _(" -f - print version, release and arch with name.
") . _(" -e - include perl code directly as perl -e.
") . _(" -a - binary AND operator, true if both expression are true.
") . _(" -o - binary OR operator, true if one expression is true.
@@ -65,6 +66,7 @@ my $media = '';
my $synthesis = '';
my $verbose = 0;
my $quiet = undef;
+my $fullname = '';
my %params;
#- parse arguments list.
@@ -82,7 +84,8 @@ while (defined($_ = shift @ARGV)) {
/^--all$/ and do { $params{$_} = 1
foreach qw(group size summary description provides requires files conflicts obsoletes prereqs); next };
/^--(group|size|epoch|summary|description|provides|requires|files|conflicts|obsoletes|prereqs)$/ and
- do { $params{$_} = 1; next };
+ do { $params{$1} = 1; next };
+ /^-f$/ and do { $full = 'full'; next };
/^-e$/ and do { $expr .= '('.$_.')'; next };
/^-a$/ and do { $expr .= ' && '; next };
/^-o$/ and do { $expr .= ' || '; next };
@@ -103,7 +106,7 @@ for (scalar(keys %params)) {
#- build callback according expression.
my $callback = 'sub { my ($urpm, $pkg) = @_; '; #- it is a good start for a sub, no ;-)
foreach (qw(group size epoch summary description provides requires files conflicts obsoletes prereqs)) {
- $params{$_} and $callback .= 'foreach my $e ($pkg->'.$_.') { local $_ = $pkg->name."'.(!$quiet && ":$_").':$e"; '.$expr.' or next; print "$_\n" }';
+ $params{$_} and $callback .= 'foreach my $e ($pkg->'.$_.') { local $_ = $pkg->'.$full.'name."'.(!$quiet && ":$_").':$e"; '.$expr.' or next; print "$_\n" }';
}
$callback .= ' 1; }';
$callback = eval $callback;
diff --git a/urpmi.spec b/urpmi.spec
index 84b543ce..295b9fc5 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 4.1
-Release: 13mdk
+Release: 14mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -204,6 +204,12 @@ fi
%changelog
+* Wed Dec 11 2002 François Pons <fpons@mandrakesoft.com> 4.1-14mdk
+- changed fuzzy search on provides to be deactived by default,
+ use --fuzzy for that now (previous behaviour of --fuzzy is kept).
+- fixed urpmf --provides, --requires, ...
+- added -f to urpmf (as used by urpmq).
+
* Wed Dec 11 2002 François Pons <fpons@mandrakesoft.com> 4.1-13mdk
- fixed error management about missing files after download.
- fixed urpme dependencies output to be user friendly.