summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xurpmi6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b4ae78b..3164ab5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-20 Pixel <pixel@mandrakesoft.com>
+
+ * urpmi: fix regexp not allowing `.' in release
+
2000-01-10 Pixel <pixel@mandrakesoft.com>
* urpmi: bug fix from Brian J. Murrell
diff --git a/urpmi b/urpmi
index a1000d5b..b6c0e507 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) = /(.*)-([^-]+)-([^-.]+)\n/;
+ my ($name, $v, $r) = /(.*)-([^-]+)-([^-]+)\n/;
exists $installed{$name} && le_version([$v, $r], $installed{$name}) or $installed{$name} = [$v, $r];
}
@installed{map { chop; $_ } @installed} = ();
@@ -156,7 +156,7 @@ sub closure_deps {
my $to_install = shift;
foreach (@_) {
exists $to_install->{$_} and next;
- my ($name, $v, $r) = /(.*)-([^-]+)-([^-.]+)/;
+ my ($name, $v, $r) = /(.*)-([^-]+)-([^-]+)/;
exists $installed{$name} && le_version([$v, $r], $installed{$name}) and next;
$to_install->{$_} = undef;
@@ -165,7 +165,7 @@ sub closure_deps {
my %l;
foreach (split '\|') {
exists $to_install->{$_} and next up;
- my ($name, $v, $r) = /(.*)-([^-]+)-([^-.]+)/;
+ my ($name, $v, $r) = /(.*)-([^-]+)-([^-]+)/;
if (exists $installed{$name}) {
le_version([$v, $r], $installed{$name}) and next up;
%l = ($name => [$v, $r]);