summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/C/urpmi.82
-rw-r--r--man/C/urpmq.82
-rw-r--r--urpm.pm24
-rwxr-xr-xurpmi2
-rw-r--r--urpmi.spec9
5 files changed, 32 insertions, 7 deletions
diff --git a/man/C/urpmi.8 b/man/C/urpmi.8
index c91a7f45..fc7889bd 100644
--- a/man/C/urpmi.8
+++ b/man/C/urpmi.8
@@ -48,7 +48,7 @@ use only update media. This means \fBurpmi\fP will search and resolve
dependencies only in media marked as update.
.IP "\fB\--media\fP"
select specific media to use instead of all media available (or update media is
-\fB--updtae\fP is used).
+\fB--update\fP is used).
.IP "\fB\--auto\fP"
installs all required dependencies without asking.
.IP "\fB\--auto-select\fP"
diff --git a/man/C/urpmq.8 b/man/C/urpmq.8
index b27169a3..efb4fe20 100644
--- a/man/C/urpmq.8
+++ b/man/C/urpmq.8
@@ -20,7 +20,7 @@ use only update media. This means \fBurpmq\fP will search and resolve
dependencies only in media marked as update.
.IP "\fB\--media\fP"
select specific media to use instead of all media available (or update media is
-\fB--updtae\fP is used).
+\fB--update\fP is used).
.IP "\fB\--auto-select\fP"
automatically select all packages that have to be upgraded according to already
installed packages and packages listed in various media registered.
diff --git a/urpm.pm b/urpm.pm
index 9180712b..6928a35b 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -542,7 +542,7 @@ sub configure {
}
foreach (grep { !$_->{ignore} && (!$options{update} || $_->{update}) } @{$urpm->{media} || []}) {
delete @{$_}{qw(start end)};
- if ($options{callback_pkg}) {
+ if ($options{callback}) {
if (-s "$urpm->{statedir}/$_->{hdlist}" > 32) {
$urpm->{log}(_("examining hdlist file [%s]", "$urpm->{statedir}/$_->{hdlist}"));
eval { ($_->{start}, $_->{end}) = $urpm->parse_hdlist("$urpm->{statedir}/$_->{hdlist}", 0) };
@@ -1271,6 +1271,24 @@ sub clean {
}
}
+#- check if supermount is used.
+sub is_using_supermount {
+ my ($urpm, $device_mntpoint) = @_;
+ local (*F, $_);
+
+ #- read /etc/fstab and check for existing mount point.
+ open F, "/etc/fstab";
+ while (<F>) {
+ my ($device, $mntpoint, $fstype, $options) = /^\s*(\S+)\s+(\/\S+)\s+(\S+)\s+(\S+)/ or next;
+ $mntpoint =~ s,/+,/,g; $mntpoint =~ s,/$,,;
+ if ($fstype eq 'supermount') {
+ $device_mntpoint eq $mntpoint and return 1;
+ $options =~ /^(?:.*[\s,])?dev=([^\s,]+)/ && $device_mntpoint eq $1 and return 1;
+ }
+ }
+ return 0;
+}
+
#- find used mount point from a pathname, use a optional mode to allow
#- filtering according the next operation (mount or umount).
sub find_mntpoints {
@@ -1745,7 +1763,9 @@ sub download_source_packages {
}
#- mount the removable device, only one or the important one.
- $examine_removable_medium->($removables{$device}[0], $device);
+ #- if supermount is used on the device, it is preferable to copy
+ #- the file instead (because it is so slooooow).
+ $examine_removable_medium->($removables{$device}[0], $device, $urpm->is_using_supermount($device) && 'copy');
}
#- get back all ftp and http accessible rpms file into the local cache
diff --git a/urpmi b/urpmi
index f8e15e8c..9c5f52ff 100755
--- a/urpmi
+++ b/urpmi
@@ -364,7 +364,7 @@ if (%{$state->{ask_unselect} || {}}) {
delete @{$state->{selected}}{keys %{$state->{ask_unselect}}};
}
if (%{$state->{ask_remove} || {}}) {
- my $list = join "\n", keys %{$state->{ask_remove}};
+ my $list = join "\n", sort { $a cmp $b } keys %{$state->{ask_remove}};
$noexpr = _("Nn");
$yesexpr = _("Yy");
message_input(_("The following packages have to be removed for others to be upgraded:\n%s\ndo you agree ?", $list) . _(" (Y/n) ")) =~ /[$noexpr]/ and $state->{ask_remove} = {};
diff --git a/urpmi.spec b/urpmi.spec
index c3174454..56766683 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,14 +2,14 @@
Name: urpmi
Version: 3.9
-Release: 4mdk
+Release: 5mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
Summary: User mode rpm install
Requires: eject webfetch perl-DateManip >= 5.40
PreReq: perl-Locale-gettext rpmtools >= 4.3-6mdk perl-URPM >= 0.50-5mdk
-BuildRequires: bzip2-devel gcc-c++ gettext rpm-devel >= 4.0.3
+BuildRequires: bzip2-devel gettext rpm-devel >= 4.0.3
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildArch: noarch
@@ -144,6 +144,11 @@ fi
%changelog
+* Fri Jul 26 2002 François Pons <fpons@mandrakesoft.com> 3.9-5mdk
+- fixed man pages typo.
+- sorted package to remove list.
+- always copy rpm if using supermount on a cdrom (avoid being too slow).
+
* Thu Jul 25 2002 François Pons <fpons@mandrakesoft.com> 3.9-4mdk
- fixed urpmq -u.