summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpmi.spec5
-rwxr-xr-xurpmq8
2 files changed, 9 insertions, 4 deletions
diff --git a/urpmi.spec b/urpmi.spec
index a627f500..7d29c8e1 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 3.3
-Release: 21mdk
+Release: 22mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -144,6 +144,9 @@ fi
%changelog
+* Mon Mar 11 2002 François Pons <fpons@mandrakesoft.com> 3.3-22mdk
+- added --wget/--curl support to urpmq (needed by rpmdrake).
+
* Thu Mar 7 2002 François Pons <fpons@mandrakesoft.com> 3.3-21mdk
- fix --wget and --curl for urpmi.addmedia.
diff --git a/urpmq b/urpmq
index 94505fc5..533e8dfb 100755
--- a/urpmq
+++ b/urpmq
@@ -63,6 +63,9 @@ usage:
exit(0);
}
+#- params contains informations to parse installed system.
+my $urpm = new urpm;
+
#- parse arguments list.
my @nextargv;
for (@ARGV) {
@@ -77,6 +80,8 @@ for (@ARGV) {
/^--sources$/ and do { $query->{sources} = 1; next };
/^--force$/ and do { $query->{force} = 1; next };
/^--root$/ and do { push @nextargv, \$query->{root}; next };
+ /^--wget$/ and do { $urpm->{sync} = \&urpm::sync_wget; next };
+ /^--curl$/ and do { $urpm->{sync} = \&urpm::sync_curl; next };
/^-(.*)$/ and do { foreach (split //, $1) {
/[\?h]/ and do { usage; next };
/d/ and do { $query->{deps} = 1; next };
@@ -105,9 +110,6 @@ for (@ARGV) {
$query->{src} = 0; #- reset switch for next package.
}
-#- params contains informations to parse installed system.
-my $urpm = new urpm;
-
#- remove verbose if not asked.
$query->{verbose} or $urpm->{log} = sub {};