summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2010-03-31 12:52:14 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2010-03-31 12:52:14 +0000
commitf758b467d47b17080b273204cd44dec25111347e (patch)
treef2f561db8337e91bf04af0a549c447c7598af663
parent9f75e0bc9eccd730c3089d8ea6d467be67d7fa74 (diff)
downloadurpmi-f758b467d47b17080b273204cd44dec25111347e.tar
urpmi-f758b467d47b17080b273204cd44dec25111347e.tar.gz
urpmi-f758b467d47b17080b273204cd44dec25111347e.tar.bz2
urpmi-f758b467d47b17080b273204cd44dec25111347e.tar.xz
urpmi-f758b467d47b17080b273204cd44dec25111347e.zip
[urpmf] in "fast mode", look in package names as well as filenames
urpmf foo used to be looking for foo in both package names and filenames, and to return all files in the package when the package name matched. The behaviour changed at some point, restore the old behaviour (#58313)
-rwxr-xr-xurpmf4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpmf b/urpmf
index b40ff2aa..b461b085 100755
--- a/urpmf
+++ b/urpmf
@@ -324,14 +324,14 @@ if ($needed_media_info{hdlist}) {
$urpm->{log}("getting information from $xml_info_file");
if ($only_simple_files_search) {
# special version for speed (3x faster), hopefully fully compatible
- my $code = sprintf(<<'EOF', $expr);
+ my $code = sprintf(<<'EOF', $expr, $expr);
my $F = urpm::xml_info::open_lzma($xml_info_file);
my $fn;
local $_;
while (<$F>) {
if (m!^<!) {
($fn) = /fn="(.*)"/;
- } elsif (%s) {
+ } elsif (%s || ($fn =~ %s)) {
$fn or $urpm->{fatal}(1, "fast algorithm is broken, please report a bug");
my $pkg = urpm::xml_info_pkg->new({ fn => $fn });
print $pkg->name, ':', $_;