diff options
| -rwxr-xr-x | urpmi | 2 | ||||
| -rwxr-xr-x | urpmi.addmedia | 6 | ||||
| -rw-r--r-- | urpmi.addmedia.8 | 5 | ||||
| -rw-r--r-- | urpmi.spec | 5 |
4 files changed, 11 insertions, 7 deletions
@@ -36,7 +36,7 @@ open STDERR, "|tee -a /var/log/urpmi.log" or die; select STDERR; $| = 1; # make unbuffered select STDOUT; $| = 1; # make unbuffered -open F, $depsfile or die "missing dependencies file ($depsfile)"; +open F, $depsfile or die "run urpmi.addmedia first\n"; foreach (<F>) { my ($pack, $size, $deps) = /(\S+)\s+(\S+)\s+(.*)/ or die("urpmi: bad format file $depsfile\n"); $size{$pack} = $size; diff --git a/urpmi.addmedia b/urpmi.addmedia index 72ef3cd8..0d8823f9 100755 --- a/urpmi.addmedia +++ b/urpmi.addmedia @@ -56,9 +56,9 @@ my $suffix; "usage: urpmi.addmedia <name> <url> where <url> is one of file://<path> - ftp://<login>:<user>@<host>/<path> with <relative path of hdlist> - ftp://<host>/<path> with <relative path of hdlist> - http://<host>/<path> with <relative path of hdlist> + ftp://<login>:<password>@<host>/<path> with <relative filename of hdlist> + ftp://<host>/<path> with <relative filename of hdlist> + http://<host>/<path> with <relative filename of hdlist> removable_<device>_<number>://<path> "; $name or die $usage; diff --git a/urpmi.addmedia.8 b/urpmi.addmedia.8 index a4ab6eae..c460536b 100644 --- a/urpmi.addmedia.8 +++ b/urpmi.addmedia.8 @@ -19,11 +19,12 @@ Where <\fIname\fP> is your reference for the media (e.g. MandrakeUpdate). <\fIhost\fP>/<\fIpath\fP> is the location of the rpm directory on the net. .br <\fIrelative path of hdlist\fP> is the pathname where to find the hdlist of the rpms. The location is given relative to <\fIpath\fP>. -.PP -ftp: .br .IP "\fB urpmi.addmedia <\fIname\fP> ftp://<\fIlogin\fP>:<\fIuser\fP>@<\fIhost\fP>/<\fIpath\fP> with <\fIrelative path of hdlist\fP>\fP" The same as for http, just add your login and user if required (Note that you needn't to specify anonymous as login for anonymous access ftp servers). +.nf +eg: urpmi.addmedia ftp ftp://a:a@leia//export/Mandrake/RPMS with ../base/hdlist +.fi .PP Local drive or NFS: .br @@ -2,7 +2,7 @@ Name: urpmi Version: 0.9 -Release: 35mdk +Release: 36mdk License: GPL Source0: %{name}.tar.bz2 Summary: User mode rpm install @@ -17,6 +17,9 @@ well-known rpms to be installed. You can compare rpm vs. urpmi with insmod vs. modprobe %changelog +* Fri Jan 7 2000 Pixel <pixel@mandrakesoft.com> +- add an example to urpmi.addmedia.8 + * Thu Jan 6 2000 Pixel <pixel@mandrakesoft.com> - urpmi: tty question now defaults to yes (y/N -> N/y) |