summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-10-20 14:17:18 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-10-20 14:17:18 +0000
commit179ae95a1f65ef423a2d5706cd032aaf2d88f016 (patch)
tree6a21d04d34c987c17c376291b8c15c3a90fcb074
parent3e6f55b7b4e4b22a9b0b70febc8fc9c564b99b85 (diff)
downloadurpmi-179ae95a1f65ef423a2d5706cd032aaf2d88f016.tar
urpmi-179ae95a1f65ef423a2d5706cd032aaf2d88f016.tar.gz
urpmi-179ae95a1f65ef423a2d5706cd032aaf2d88f016.tar.bz2
urpmi-179ae95a1f65ef423a2d5706cd032aaf2d88f016.tar.xz
urpmi-179ae95a1f65ef423a2d5706cd032aaf2d88f016.zip
New urpmf option : -F (like in awk :)
-rw-r--r--urpm/args.pm5
-rwxr-xr-xurpmf7
2 files changed, 8 insertions, 4 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index 2e3b638d..5600bd99 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -34,7 +34,7 @@ sub import {
# used by urpmf
sub add_param_closure {
my (@tags) = @_;
- return sub { $::qf .= join ':', '', map "%$_", @tags };
+ return sub { $::qf .= join $::separator, '', map "%$_", @tags };
}
# options specifications for Getopt::Long
@@ -156,7 +156,8 @@ my %options_spec = (
'verbose|v' => \$::verbose,
m => add_param_closure('media'),
i => sub { $::pattern = 'i' },
- f => sub { $::full = 'full' },
+ f => sub { $::full = 1 },
+ 'F=s' => sub { $::separator = $_[1] },
'e=s' => sub { $::expr .= "($_[1])" },
a => sub { $::expr .= ' && ' },
o => sub { $::expr .= ' || ' },
diff --git a/urpmf b/urpmf
index 8bd50603..11e601da 100755
--- a/urpmf
+++ b/urpmf
@@ -29,7 +29,8 @@ Copyright (C) 2002-2005 Mandriva.
This is free software and may be redistributed under the terms of the GNU GPL.
usage:
-", $urpm::VERSION) . N(" --help - print this help message
+", $urpm::VERSION)
+ . N(" --help - print this help message
") . N(" --arch - print architecture
") . N(" --buildhost - print build host
") . N(" --buildtime - print build time
@@ -64,6 +65,7 @@ usage:
") . N(" -m - print the media in which the package was found
") . N(" -i - ignore case distinctions in every pattern
") . N(" -f - print version, release and arch with name
+") . N(" -F<str> - change field separator (defaults to ':')
") . N(" -e - include perl code directly as perl -e
") . N(" -a - binary AND operator, true if both expression are true
") . N(" -o - binary OR operator, true if one expression is true
@@ -82,6 +84,7 @@ our $literal = 0; # should we quotemeta the pattern
our $media = '';
our $pattern = ''; # regexp match flags ("i" or "")
our $qf = '%default'; # format string
+our $separator = ':'; # default field separator
our $sortmedia = '';
our $synthesis = '';
our $uniq = ''; # --uniq
@@ -97,7 +100,7 @@ urpm::args::parse_cmdline();
if ($qf eq '%default') {
#- nothing on the command-line : default is to search on file names
- $qf = '%name:%files';
+ $qf = '%name' . $separator . '%files';
} else {
#- else default to a leading %name
$qf =~ s/%default\b/%name/;