summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm.pm2
-rw-r--r--urpmi.spec6
-rwxr-xr-xurpmi.update2
-rwxr-xr-xurpmq21
4 files changed, 27 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 33f58ab0..516fb3a9 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1169,6 +1169,8 @@ sub update_media {
#- take care of modified medium only or all if all have to be recomputed.
$medium->{ignore} and next;
+ $options{forcekey} and delete $medium->{'key-ids'};
+
#- and create synthesis file associated if it does not already exists...
-s "$urpm->{statedir}/synthesis.$medium->{hdlist}" > 32 or $medium->{modified_synthesis} = 1;
diff --git a/urpmi.spec b/urpmi.spec
index 03e23fad..affccbb9 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -1,6 +1,6 @@
%define name urpmi
%define version 4.4
-%define release 47mdk
+%define release 48mdk
%define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -228,6 +228,10 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
%{compat_perl_vendorlib}/urpm/parallel_ssh.pm
%changelog
+* Wed Dec 24 2003 Olivier Thauvin <thauvin@aerov.jussieu.fr> 4.4-48mdk
+- urpmi.update: add --force-key
+- urpmq: add --list-url and --dump-config
+
* Mon Dec 22 2003 Warly <warly@mandrakesoft.com> 4.4-47mdk
- rebuild for new perlreq
diff --git a/urpmi.update b/urpmi.update
index 41dd0101..99fb2856 100755
--- a/urpmi.update
+++ b/urpmi.update
@@ -33,6 +33,7 @@ sub main {
/^--?f$/ and ++$options{force}, next;
/^--?z$/ and ++$options{compress}, next;
/^--update$/ and $options{update} = 1, next;
+ /^--force-key$/ and $options{forcekey} = 1, next;
/^--wget$/ and $urpm->{sync} = sub { my $options = shift @_;
if (ref $options) { $options->{prefer} = 'wget' }
else { $options = { dir => $options, prefer => 'wget' } }
@@ -68,6 +69,7 @@ where <name> is a medium name to update.
authentication (format is <user:password>).
") . N(" --update - update only update media.
") . N(" --no-md5sum - disable MD5SUM file checking.
+") . N(" --force-key - force update of gpg key.
") . N(" -a - select all non-removable media.
") . N(" -c - clean headers cache directory.
") . N(" -f - force generation of hdlist files.
diff --git a/urpmq b/urpmq
index edbdce5a..17f651e1 100755
--- a/urpmq
+++ b/urpmq
@@ -46,6 +46,8 @@ usage:
packages that leads to remove.
") . N(" --list - list available packages.
") . N(" --list-media - list available media.
+") . N(" --list-url - list available media and their url.
+") . N(" --dump-config - dump the config in form of urpmi.addmedia argument.
") . N(" --list-nodes - list available nodes when using --parallel.
") . N(" --list-aliases - list available parallel aliases.
") . N(" --src - next package is a source package (same as -s).
@@ -99,6 +101,8 @@ while (defined($_ = shift @ARGV)) {
/^--keep$/ and do { $query->{keep} = 1; next };
/^--list$/ and do { $query->{list} = 1; next };
/^--list-media$/ and do { $query->{list_media} = 1; next };
+ /^--list-url$/ and do { $query->{list_url} = 1; next };
+ /^--dump-config$/ and do { $query->{dump_config} = 1; next };
/^--list-nodes$/ and do { $query->{list_nodes} = 1; next };
/^--list-aliases$/ and do { $query->{list_aliases} = 1; next };
/^--src$/ and do { $query->{src} = 1; next };
@@ -163,7 +167,7 @@ while (defined($_ = shift @ARGV)) {
$query->{verbose} or $urpm->{log} = sub {};
#- improve speed if using any list_... options.
-$query->{nodepslist} = $query->{list_aliases} || $query->{list_nodes} || $query->{list_media};
+$query->{nodepslist} = $query->{list_aliases} || $query->{list_nodes} || $query->{list_media} || $query->{dump_config} || $query->{list_url};
if ($query->{env}) {
print STDERR N("using specific environment on %s\n", $query->{env});
@@ -206,11 +210,22 @@ if ($query->{list_aliases}) {
print "$_\n";
}
exit 0;
-} elsif ($query->{list_media}) {
+} elsif ($query->{list_media} || $query->{list_url}) {
foreach (@{$urpm->{media}}) {
- print "$_->{name}\n";
+ print "$_->{name}" . ($query->{list_url} ? " $_->{url}" : "") . "\n";
}
exit 0;
+} elsif ($query->{dump_config}) {
+ foreach (@{$urpm->{media}}) {
+ $_->{update} and print "--update ";
+ $_->{virtual} and print "--virtual ";
+ $_->{synthesis} and print "--synthesis ";
+ print "$_->{name} ";
+ print "$_->{url} ";
+ print $_->{with_hdlist} ? "with $_->{with_hdlist}" : "";
+ print "\n";
+ }
+ exit 0;
} elsif ($query->{list}) {
#- if list has been activated, select all...
@{$state->{selected}}{0 .. $#{$urpm->{depslist}}} = ();