summaryrefslogtreecommitdiffstats
path: root/mdkupdate
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2005-09-15 17:52:40 +0000
committerDaouda Lo <daouda@mandriva.com>2005-09-15 17:52:40 +0000
commita762a09a64c8d746298e6212b52905d3c5d20b1b (patch)
treee0eb931d88f08bace1494d7790c08b1bbfd8af40 /mdkupdate
parent726c740773992c06b19272f14c17cadaa96bcef3 (diff)
downloadmgaonline-a762a09a64c8d746298e6212b52905d3c5d20b1b.tar
mgaonline-a762a09a64c8d746298e6212b52905d3c5d20b1b.tar.gz
mgaonline-a762a09a64c8d746298e6212b52905d3c5d20b1b.tar.bz2
mgaonline-a762a09a64c8d746298e6212b52905d3c5d20b1b.tar.xz
mgaonline-a762a09a64c8d746298e6212b52905d3c5d20b1b.zip
- merge changes
Diffstat (limited to 'mdkupdate')
-rwxr-xr-xmdkupdate9
1 files changed, 7 insertions, 2 deletions
diff --git a/mdkupdate b/mdkupdate
index abdaa1e9..8e83de52 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -43,11 +43,12 @@ my $afterrpm = "$confdir/rpm_qa_installed_after";
my $logfile = '/var/tmp/mdkupdate.log';
my $onlineUrl = "https://www.mandrivaonline.com/";
+
my $url;
foreach (qw(online_dif online_update online3_RemoteAction wizard)) {
$url->{$_} = $onlineUrl . $_ . '.php';
}
-my $VERSION = "1.1";
+my $VERSION = "1.3";
my $YEARS = "2002-2005";
#for compatibilities
@@ -102,7 +103,11 @@ if ($o{LOGIN} && $o{PASS} && $o{LOGIN} !~ /\s+/ && $o{PASS} !~ /\s+/) {
#printf "SCHEDULED = $scheduled\nNOSCHEDULED = $noscheduled\n";
-f $currentrpm or rpm_qa($currentrpm);
if ($opt eq '--applet') {
- system "/usr/bin/MandrakeUpdate", "--no-confirmation", "--no-media-update", "--media=update_source", "--pkg-sel=$scheduled", "--pkg-nosel=$noscheduled";
+ if ($release <= 10.1) {
+ system "/usr/bin/MandrakeUpdate", "--no-confirmation", "--media=update_source", "--pkg-sel=$scheduled", "--pkg-nosel=$noscheduled";
+ } else {
+ system "/usr/bin/MandrakeUpdate", "--no-confirmation", "--no-media-update", "--media=update_source", "--pkg-sel=$scheduled", "--pkg-nosel=$noscheduled";
+ }
} elsif ($opt eq '--noX') {
my $in = interactive->vnew;
my $pkgs = ask_pkgs($in);