summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-06-14 16:07:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-06-14 16:07:26 +0000
commit461f2dad25d7ebea70b250c1f360360234a1c867 (patch)
treeda1d10b8c4fc0418371a9abd123c466b11891e57
parent3e87709832b4cdfabca3a353a43b75ba86e5a772 (diff)
downloadurpmi-461f2dad25d7ebea70b250c1f360360234a1c867.tar
urpmi-461f2dad25d7ebea70b250c1f360360234a1c867.tar.gz
urpmi-461f2dad25d7ebea70b250c1f360360234a1c867.tar.bz2
urpmi-461f2dad25d7ebea70b250c1f360360234a1c867.tar.xz
urpmi-461f2dad25d7ebea70b250c1f360360234a1c867.zip
- urpmf
o add option --use-distrib
-rw-r--r--NEWS2
-rw-r--r--pod/urpmf.8.pod4
-rw-r--r--urpm/args.pm2
-rwxr-xr-xurpmf2
-rw-r--r--urpmi.bash-completion2
5 files changed, 10 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f27c102d..105beb4f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- urpmf
+ o add option --use-distrib
- urpmq
o allow using --use-distrib as non-root
- all tools
diff --git a/pod/urpmf.8.pod b/pod/urpmf.8.pod
index ff3f9c89..c17395f3 100644
--- a/pod/urpmf.8.pod
+++ b/pod/urpmf.8.pod
@@ -64,6 +64,10 @@ so on. Media which aren't listed are taken into account after the others.
Use the given synthesis file instead of urpmi db for searching packages.
+=item B<--use-distrib> I<directory>
+
+Use the given distribution tree instead of urpmi db for searching packages.
+
=item B<--uniq>
Do not print identical lines twice.
diff --git a/urpm/args.pm b/urpm/args.pm
index 831facd3..d6ae29f7 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -367,7 +367,7 @@ foreach my $k ("root=s", "nolock", "use-distrib=s")
}
foreach my $k ("help|h", "version", "no-locales", "update", "media|mediums=s",
- "excludemedia|exclude-media=s", "sortmedia|sort-media=s",
+ "excludemedia|exclude-media=s", "sortmedia|sort-media=s", "use-distrib=s",
"synthesis=s", "env=s")
{
$options_spec{urpmf}{$k} = $options_spec{urpmi}{$k};
diff --git a/urpmf b/urpmf
index 7edee6a0..1b553461 100755
--- a/urpmf
+++ b/urpmf
@@ -40,6 +40,7 @@ usage: urpmf [options] pattern-expression
") . N(" --urpmi-root - use another root for urpmi db & rpm installation.
") . N(" --media - use only the given media, separated by comma.
") . N(" --sortmedia - sort media according to substrings separated by comma.
+") . N(" --use-distrib - use the given path to access media
") . N(" --synthesis - use the given synthesis instead of urpmi db.
") . N(" --uniq - do not print identical lines twice.
") . N(" --update - use only update media.
@@ -212,6 +213,7 @@ urpm::media::configure($urpm,
excludemedia => $excludemedia,
sortmedia => $sortmedia,
synthesis => $synthesis,
+ usedistrib => $urpm::args::options{usedistrib},
update => $update,
callback => $callback,
need_hdlist => $need_hdlist,
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index 10322fd2..b734171b 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -240,7 +240,7 @@ _urpmf()
if [[ "$cur" == -* ]]; then
# return list of available options
COMPREPLY=( $( compgen -W '-i -f -e -a -o -m --help --update \
- --media --excludemedia --sortmedia --synthesis \
+ --media --excludemedia --sortmedia --synthesis --use-distrib \
--verbose --quiet --uniq --name --group --size \
--epoch --summary --description --sourcerpm --packager\
--buildhost --url --provides --requires --files \