summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xurpmf2
-rwxr-xr-xurpmi1
-rw-r--r--urpmi.spec14
3 files changed, 15 insertions, 2 deletions
diff --git a/urpmf b/urpmf
index 7332f4da..a2814311 100755
--- a/urpmf
+++ b/urpmf
@@ -9,7 +9,7 @@ dir="/var/lib/urpmi"
if /bin/ls $dir/hdlist.* >/dev/null 2>/dev/null; then
- packdrake -c $dir/hdlist.* | hdlist2files - | grep -E "$1"
+ packdrake -c $dir/hdlist.* | parsehdlist --files --quiet - | grep -E "$1"
else
echo "urpmi is not installed"
exit 1
diff --git a/urpmi b/urpmi
index 66e9b0f9..393f5d78 100755
--- a/urpmi
+++ b/urpmi
@@ -60,6 +60,7 @@ sub usage {
#- parse arguments list.
my @nextargv;
for (@ARGV) {
+ /^--help$/ and do { usage; next };
/^--auto$/ and do { $auto = 1; next };
/^--force$/ and do { $force = 1; next };
/^--X$/ and do { $X = 1; next };
diff --git a/urpmi.spec b/urpmi.spec
index 84d6a0f1..0d2b6746 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 1.3
-Release: 1mdk
+Release: 2mdk
License: GPL
Source0: %{name}.tar.bz2
Summary: User mode rpm install
@@ -67,6 +67,12 @@ if [ "$1" = "0" ]; then
fi
exit 0
+%post
+if [ -r /var/lib/urpmi/depslist ]; then
+ rm -f /var/lib/urpmi/depslist
+ [ -z "$DURING_INSTALL" ] && %{_sbindir}/urpmi.updatemedia
+fi
+
%preun -n autoirpm
autoirpm.uninstall
@@ -96,6 +102,12 @@ autoirpm.uninstall
%changelog
+* Tue Aug 31 2000 François Pons <fpons@mandrakesoft.com> 1.3-2mdk
+- added code to proper upgrade of urpmi 1.2.
+- added small correction in urpmi for basesystem selection.
+- fixed help invocation (thanks to Bryan Paxton).
+- modified urpmf not to use rpmtools-compat.
+
* Mon Aug 28 2000 François Pons <fpons@mandrakesoft.com> 1.3-1mdk
- 1.3 of urpmi.
- use rpmtools perl interface to access hdlist and build requires.