summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-07-02 17:08:09 +0000
committerFrancois Pons <fpons@mandriva.com>2001-07-02 17:08:09 +0000
commitbe05e4a5a7a08df909b2713faa0d7c72b487fd9c (patch)
tree0b83a14a0f237399351e4698117f9a00a332b40b
parentab6ad72f9f7379713af3cb358d2f829acebed5c4 (diff)
downloadurpmi-be05e4a5a7a08df909b2713faa0d7c72b487fd9c.tar
urpmi-be05e4a5a7a08df909b2713faa0d7c72b487fd9c.tar.gz
urpmi-be05e4a5a7a08df909b2713faa0d7c72b487fd9c.tar.bz2
urpmi-be05e4a5a7a08df909b2713faa0d7c72b487fd9c.tar.xz
urpmi-be05e4a5a7a08df909b2713faa0d7c72b487fd9c.zip
*** empty log message ***
-rw-r--r--urpm.pm4
-rw-r--r--urpmi.spec6
2 files changed, 7 insertions, 3 deletions
diff --git a/urpm.pm b/urpm.pm
index 2b6b16e2..490dd05a 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -918,7 +918,7 @@ sub register_local_packages {
$urpm->{fatal}(7, _("rpmtools package is too old, please upgrade it"));
}
}
- $error and die "error registering local packages";
+ $error and $urpm->{fatal}(1, _("error registering local packages"));
#- compute depslist associated.
$urpm->{params}->compute_depslist;
@@ -1020,7 +1020,7 @@ sub search_packages {
$best->{info}{release});
if ($_->{info}{serial} > $best->{info}{serial} || $cmp_version > 0 || $cmp_release > 0 ||
($_->{info}{serial} == $best->{info}{serial} && $cmp_version == 0 && $cmp_release == 0 &&
- better_arch($_->{info}{arch}, $best->{info}{arch}))) {
+ rpmtools::better_arch($_->{info}{arch}, $best->{info}{arch}))) {
$best = $_;
}
} else {
diff --git a/urpmi.spec b/urpmi.spec
index 0e3f36de..f9379fb3 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 1.6
-Release: 8mdk
+Release: 9mdk
License: GPL
Source0: %{name}.tar.bz2
Summary: User mode rpm install
@@ -106,6 +106,10 @@ rm -f /var/lib/urpmi/depslist
%changelog
+* Mon Jul 2 2001 François Pons <fpons@mandrakesoft.com> 1.6-9mdk
+- fixed missing rpmtools reference in urpm library.
+- changed die in fatal error.
+
* Mon Jul 2 2001 François Pons <fpons@mandrakesoft.com> 1.6-8mdk
- fixed typo by pixel.
- fixed bad reference in urpm reported by Michael Reinsch.
; return; } 1; } sub find_servers() { my (undef, @l) = `nmblookup "*"`; s/\s.*\n// foreach @l; my @servers = grep { network::network::is_ip($_) } @l; my %servers; $servers{$_}{ip} = $_ foreach @servers; my ($ip); foreach (`nmblookup -A @servers`) { if (my $nb = /^Looking up status of (\S+)/ .. /^$/) { if ($nb == 1) { $ip = $1; } else { /<00>/ or next; $servers{$ip}{/<GROUP>/ ? 'group' : 'name'} ||= lc first(/(\S+)/); } } } values %servers; } sub find_exports { my ($server) = @_; my @l; my $name = $server->{name} || $server->{ip}; my $group = $server->{group} ? " -W $server->{group}" : ''; # WARNING: using smbclient -L is ugly. It can't handle more than 15 # characters shared names foreach (`smbclient -U% -L $name -I $server->{ip}$group`) { chomp; s/^\t//; my ($name, $type, $comment) = unpack "A15 A10 A*", $_; if ($name eq '---------' && $type eq '----' && $comment eq '-------' .. /^$/) { push @l, { name => $name, type => $type, comment => $comment } if $type eq 'Disk' && $name ne 'ADMIN$'; } } @l; } 1;