no_comment

4 files changed, 17 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index aaba2e93..6b4ae78b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-01-10  Pixel  <pixel@mandrakesoft.com>
+
+	* urpmi: bug fix from Brian J. Murrell
+
+2000-01-07  Pixel  <pixel@mandrakesoft.com>
+
+	* urpmi: tty question now defaults to yes and acts that way!
+
 2000-01-06  Pixel  <pixel@mandrakesoft.com>
 
 	* urpmi: tty question now defaults to yes (y/N -> N/y)
diff --git a/Makefile b/Makefile
index 279124fb..9f3eeb12 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PREFIX = 
+ PREFIX = 
 BINDIR = $(PREFIX)/usr/bin
 MANDIR = $(PREFIX)/usr/man
 SBINDIR = $(PREFIX)/usr/sbin
diff --git a/urpmi b/urpmi
index 48ea7d15..a1000d5b 100755
--- a/urpmi
+++ b/urpmi
@@ -68,7 +68,7 @@ $ok or exit 1;
 
 @installed = `/bin/rpm -qa`; $? and die(_("rpm database query failed\n"));
 foreach (@installed) {
-    my ($name, $v, $r) = /(.*)-([^-]+)-([^-.]+)/;
+    my ($name, $v, $r) = /(.*)-([^-]+)-([^-.]+)\n/;
     exists $installed{$name} && le_version([$v, $r], $installed{$name}) or $installed{$name} = [$v, $r];
 }
 @installed{map { chop; $_ } @installed} = ();
@@ -86,7 +86,7 @@ if (!$auto and difference2(\@to_install, \@packages)) {
 	$? and exit 0;
     } else {
 	print SAVEOUT "$msg:\n@to_install\n$msg2 (Y/n) ";
-	<STDIN> =~ /n/i or exit 0;
+	<STDIN> =~ /n/i and exit 0;
     }
 }
 
@@ -210,7 +210,7 @@ sub version_compare {
 }
 sub le_version {
     my $cmp = version_compare($_[0][0], $_[1][0]);
-    return $cmp < 0 || $cmp == 0 && version_compare($_[0][1], $_[1][1]) < 0;
+    return $cmp < 0 || $cmp == 0 && version_compare($_[0][1], $_[1][1]) <= 0;
 }
 
 sub toMb {
diff --git a/urpmi.spec b/urpmi.spec
index 002dd832..83b5f872 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 0.9
-Release: 36mdk
+Release: 38mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Summary: User mode rpm install
@@ -17,7 +17,11 @@ well-known rpms to be installed.
 You can compare rpm vs. urpmi  with  insmod vs. modprobe
 
 %changelog
+* Mon Jan 10 2000 Pixel <pixel@mandrakesoft.com>
+- bug fix from Brian J. Murrell
+
 * Fri Jan  7 2000 Pixel <pixel@mandrakesoft.com>
+- urpmi: tty question now defaults to yes and acts that way!
 - add an example to urpmi.addmedia.8
 
 * Thu Jan  6 2000 Pixel <pixel@mandrakesoft.com>