From 4bddb9a60cd5808c9f9650f7c9c0cadc68225a65 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Sun, 3 Sep 2000 16:08:17 +0000
Subject: *** empty log message ***

---
 urpmi          | 20 ++++++++++----------
 urpmi.addmedia |  2 +-
 urpmi.spec     |  6 +++++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/urpmi b/urpmi
index 393f5d78..fc053fbb 100755
--- a/urpmi
+++ b/urpmi
@@ -330,17 +330,17 @@ foreach my $id (keys %packages_to_install) {
 #- package to install as a array of strings.
 my @to_install;
 
+#- check if there is at least one package to install that
+#- has not been given by the user.
+my $ask_user;
+my $sum = 0;
+foreach (keys %packages_to_install) {
+    exists $packages{$_} or $ask_user = 1;
+    my $info  = $params->{depslist}[$_];
+    $sum += $info->{size};
+    push @to_install, "$info->{name}-$info->{version}-$info->{release}";
+}
 if (!$auto) {
-    #- check if there is at least one package to install that
-    #- has not been given by the user.
-    my $ask_user;
-    my $sum = 0;
-    foreach (keys %packages_to_install) {
-	exists $packages{$_} or $ask_user = 1;
-	my $info  = $params->{depslist}[$_];
-	$sum += $info->{size};
-	push @to_install, "$info->{name}-$info->{version}-$info->{release}";
-    }
     if ($ask_user) {
 	my $msg = _("To satisfy dependencies, the following packages are going to be installed (%d MB)", toMb($sum));
 	my $msg2 = _("Is it ok?");
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 60eae2ea..1561c19e 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -95,7 +95,7 @@ if (my ($prefix, $dir) = $url =~ m,^(removable_.*?|file):/(.*),) {
     if (-e $f) {
 	system("cp -f $f $HDLIST");
     } else {
-	glob("$dir/*") or die "No RPM-s found! Cowardly refusing to add $dir to urpmi DB.\n";
+	glob("$dir/*.rpm") or die "No RPM-s found! Cowardly refusing to add $dir to urpmi DB.\n";
 	system("genhdlist_cz2 -o $HDLIST $dir");
     }
 } else {
diff --git a/urpmi.spec b/urpmi.spec
index 376f2b28..b52acef4 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 1.3
-Release: 3mdk
+Release: 4mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Summary: User mode rpm install
@@ -103,6 +103,10 @@ autoirpm.uninstall
 
 
 %changelog
+* Fri Sep 01 2000 François Pons <fpons@mandrakesoft.com> 1.3-4mdk
+- fixed --auto usage (thanks to Garbage Collector).
+- fixed urpmi.addmedia with glob on rpm files only.
+
 * Thu Aug 31 2000 François Pons <fpons@mandrakesoft.com> 1.3-3mdk
 - Oops, fixed typo in post.
 
-- 
cgit v1.2.1