diff options
| -rw-r--r-- | urpm.pm | 21 | ||||
| -rw-r--r-- | urpmf.8 | 6 | ||||
| -rw-r--r-- | urpmi.8 | 6 | ||||
| -rwxr-xr-x | urpmi.addmedia | 2 | ||||
| -rw-r--r-- | urpmi.addmedia.8 | 18 | ||||
| -rwxr-xr-x | urpmi.removemedia | 2 | ||||
| -rw-r--r-- | urpmi.removemedia.8 | 8 | ||||
| -rw-r--r-- | urpmi.spec | 6 | ||||
| -rwxr-xr-x | urpmi.update | 2 | ||||
| -rw-r--r-- | urpmi.update.8 | 11 | ||||
| -rw-r--r-- | urpmq.8 | 6 |
11 files changed, 75 insertions, 13 deletions
@@ -629,6 +629,27 @@ sub update_media { $urpm->write_base_files(); $urpm->{modified} = 0; } + + #- clean headers cache directory to remove everything that is no more + #- usefull according to depslist used. + if ($options{noclean}) { + local (*D, $_); + my %arch; + opendir D, "$urpm->{cachedir}/headers"; + while (defined($_ = readdir D)) { + /^([^\/]*)-([^-]*)-([^-]*)\.([^\.]*)$/ and $arch{"$1-$2-$3"} = $4; + } + closedir D; + $urpm->{log}("found " . scalar(keys %arch) . " headers in cache"); + foreach (@{$urpm->{params}{depslist}}) { + delete $arch{"$_->{name}-$_->{version}-$_->{release}"}; + } + $urpm->{log}("removing " . scalar(keys %arch) . " obsolete headers in cache"); + foreach (keys %arch) { + unlink "$urpm->{cachedir}/headers/$_.$arch{$_}"; + } + } + #- this file is written in any cases. $urpm->write_config(); @@ -1,4 +1,4 @@ -.TH urpmf 8 "05 Apr 2001" "Mandrakesoft" "Linux-Mandrake" +.TH urpmf 8 "10 Apr 2001" "Mandrakesoft" "Linux-Mandrake" .IX urpmf .SH NAME urpmf \- RPMFind - Finds the RPM package providing the specified file @@ -38,6 +38,10 @@ use \fBurpmi.update -a\fP to generate them. These files are not mandatory. .br Contains media description, previous format from older urpmi is accepted. .PP +/etc/urpmi/skip.list +.br +Contains package names that should be not automatically updated. +.PP /var/lib/urpmi/depslist.ordered .br A simple text file containing all dependencies of all known packages. @@ -1,4 +1,4 @@ -.TH urpmi 8 "05 Apr 2001" "Mandrakesoft" "Linux-Mandrake" +.TH urpmi 8 "10 Apr 2001" "Mandrakesoft" "Linux-Mandrake" .IX urpmi .SH NAME urpmi \- rpm wrapper making installs easier for the user @@ -98,6 +98,10 @@ use \fBurpmi.update -a\fP to generate them. These files are not mandatory. .br Contains media description, previous format from older urpmi is accepted. .PP +/etc/urpmi/skip.list +.br +Contains package names that should be not automatically updated. +.PP /var/lib/urpmi/depslist.ordered .br A simple text file containning all dependencies of all known packages. diff --git a/urpmi.addmedia b/urpmi.addmedia index 8ad65c3e..a00a7b6e 100755 --- a/urpmi.addmedia +++ b/urpmi.addmedia @@ -56,7 +56,7 @@ where <url> is one of $urpm->read_config; $urpm->add_medium($name, $url, $relative_hdlist); - $urpm->update_media; + $urpm->update_media(noclean => 1); #- check creation of media (during update has been successfull) my ($medium) = grep { $_->{name} eq $name } @{$urpm->{media}}; diff --git a/urpmi.addmedia.8 b/urpmi.addmedia.8 index 5da4bd5d..5d751249 100644 --- a/urpmi.addmedia.8 +++ b/urpmi.addmedia.8 @@ -1,4 +1,4 @@ -.TH urpmi.addmedia 8 "05 Apr 2001" "Mandrakesoft" "Linux-Mandrake" +.TH urpmi.addmedia 8 "10 Apr 2001" "Mandrakesoft" "Linux-Mandrake" .IX urpmi.addmedia .SH NAME urpmi.addmedia \- adds a new rpms media for use with urpmi @@ -22,13 +22,19 @@ Where <\fIname\fP> is your reference for the media (e.g. MandrakeUpdate). .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>. -.nf -eg: urpmi.addmedia ftp ftp://a:a@leia//export/Mandrake/RPMS with ../base/hdlist -.fi .br +Note that \fBwget\fP is used to download files, you may add specific options to +\fBwget\fP by editing \fB/etc/wgetrc\fP file. Please refer to \fBwget\fP +documentation for more information. .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). +.br +Note that \fBwget\fP is used to download files, so if a firewall is used you may +have to add \fBpassive_ftp=on\fP option to \fB/etc/wgetrc\fP. +.nf +eg: urpmi.addmedia ftp ftp://a:a@leia//export/Mandrake/RPMS with ../base/hdlist +.fi .PP Local drive or NFS: .br @@ -72,6 +78,10 @@ use \fBurpmi.update -a\fP to generate them. These files are not mandatory. .br Contains media description, previous format from older urpmi is accepted. .PP +/etc/urpmi/skip.list +.br +Contains package names that should be not automatically updated. +.PP /var/lib/urpmi/depslist.ordered .br A simple text file containing all dependencies of all known packages. diff --git a/urpmi.removemedia b/urpmi.removemedia index 96529745..72346e21 100755 --- a/urpmi.removemedia +++ b/urpmi.removemedia @@ -53,7 +53,7 @@ where <name> is a medium name to remove. @toremoves == 0 and die sprintf(_("the entry to remove is missing\n(one of %s)\n"), join(", ", @entries)); $urpm->remove_media(@toremoves); - $urpm->update_media; + $urpm->update_media(noclean => !$options{all}); } main(@ARGV); diff --git a/urpmi.removemedia.8 b/urpmi.removemedia.8 index 4981839a..e7aa7d84 100644 --- a/urpmi.removemedia.8 +++ b/urpmi.removemedia.8 @@ -1,4 +1,4 @@ -.TH urpmi.removemedia 8 "05 Apr 2001" "Mandrakesoft" "Linux-Mandrake" +.TH urpmi.removemedia 8 "10 Apr 2001" "Mandrakesoft" "Linux-Mandrake" .IX urpmi.removemedia .SH NAME urpmi.removemedia \- remove a rpms media from the known medias of urpmi @@ -30,7 +30,11 @@ There is one filelist per media(*). .PP /etc/urpmi/urpmi.cfg .br -Contains one line <\fIname\fP> <\fIurl\fP> per media. +Contains media description, previous format from older urpmi is accepted. +.PP +/etc/urpmi/skip.list +.br +Contains package names that should be not automatically updated. .PP /var/lib/urpmi/depslist.ordered .br @@ -2,7 +2,7 @@ Name: urpmi Version: 1.5 -Release: 29mdk +Release: 30mdk License: GPL Source0: %{name}.tar.bz2 Summary: User mode rpm install @@ -114,6 +114,10 @@ autoirpm.uninstall %changelog +* Tue Apr 10 2001 François Pons <fpons@mandrakesoft.com> 1.5-30mdk +- fixed header clean-up. +- updated man pages. + * Mon Apr 9 2001 François Pons <fpons@mandrakesoft.com> 1.5-29mdk - fixed some missing requires for -m mode. - fixed bad search with version and release. diff --git a/urpmi.update b/urpmi.update index 497e23fa..db035fff 100755 --- a/urpmi.update +++ b/urpmi.update @@ -43,6 +43,8 @@ sub main { _("usage: urpmi.update [-a] <name> ... where <name> is a medium name to update. -a select all non-removable media. + -c clean headers cache directory. + -f force generation of hdlist or base files. \nunknown options '%s'\n"), $_); push @toupdates, $_; } diff --git a/urpmi.update.8 b/urpmi.update.8 index fcb899c7..c6efcb8b 100644 --- a/urpmi.update.8 +++ b/urpmi.update.8 @@ -1,4 +1,4 @@ -.TH urpmi.update 8 "05 Apr 2001" "Mandrakesoft" "Linux-Mandrake" +.TH urpmi.update 8 "10 Apr 2001" "Mandrakesoft" "Linux-Mandrake" .IX urpmi.update .SH NAME urpmi.update \- Updates packages list for specified medias @@ -13,6 +13,11 @@ Usefull for ftp location for example. .SH OPTION .IP "\fB\-a\fP" Select all media that are not using a removable device to update them. +.IP "\fB\-c\fP" +Clean /var/cache/urpmi/headers directory on exit. +.IP "\fB\-f\fP" +Force rebuild of hdlist files or base files (/var/lib/urpmi/depslist.ordered, +/var/lib/urpmi/provides and /var/lib/urpmi/compss). .SH FILES /usr/bin/urpmi .br @@ -38,6 +43,10 @@ use \fBurpmi.update -a\fP to generate them. These files are not mandatory. .br Contains media description, previous format from older urpmi is accepted. .PP +/etc/urpmi/skip.list +.br +Contains package names that should be not automatically updated. +.PP /var/lib/urpmi/depslist.ordered .br A simple text file containing all dependencies of all known packages. @@ -1,4 +1,4 @@ -.TH urpmq 8 "05 Apr 2001" "Mandrakesoft" "Linux-Mandrake" +.TH urpmq 8 "10 Apr 2001" "Mandrakesoft" "Linux-Mandrake" .IX urpmq .SH NAME urpmq \- urpmi database query tool. @@ -74,6 +74,10 @@ use \fBurpmi.update -a\fP to generate them. These files are not mandatory. .br Contains media description, previous format from older urpmi is accepted. .PP +/etc/urpmi/skip.list +.br +Contains package names that should be not automatically updated. +.PP /var/lib/urpmi/depslist.ordered .br A simple text file containning all dependencies of all known packages. |