summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2006-03-07 11:20:30 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2006-03-07 11:20:30 +0000
commit86c717d1a2ace8f2a3c061f9404a924053f5a3ba (patch)
tree32ba095674a6b92f8f180d4fc992d47f6f966ec1
parent19a731b95079ea5cb0a3b8064744f63926a00524 (diff)
downloadmgaonline-86c717d1a2ace8f2a3c061f9404a924053f5a3ba.tar
mgaonline-86c717d1a2ace8f2a3c061f9404a924053f5a3ba.tar.gz
mgaonline-86c717d1a2ace8f2a3c061f9404a924053f5a3ba.tar.bz2
mgaonline-86c717d1a2ace8f2a3c061f9404a924053f5a3ba.tar.xz
mgaonline-86c717d1a2ace8f2a3c061f9404a924053f5a3ba.zip
display the Mandriva One warning earlier, before doing any SOAP request
-rwxr-xr-xmdkupdate8
1 files changed, 4 insertions, 4 deletions
diff --git a/mdkupdate b/mdkupdate
index 7f15785c..65e89c99 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -132,6 +132,10 @@ if (!$bundle) {
}
} else {
+ if (-d '/live/media/loopbacks') {
+ $in->ask_warn(N("Warning"), N("You first need to install the system on your harddrive with the 'Live Install' wizard."));
+ $in->exit(1);
+ }
my $bundle_info;
my %bundle_vars = getVarsFromSh($bundle);
@@ -146,10 +150,6 @@ if (!$bundle) {
You need to update to a newer version. You can get a new one from http://start.mandriva.com"));
$in->exit(1);
}
- if (-d '/live/media/loopbacks') {
- $in->ask_warn(N("Warning"), N("You first need to install the system on your harddrive with the 'Live Install' wizard."));
- $in->exit(1);
- }
$res eq 'OK' and $bundle_info = mdkonline::soap_query_bundle($wc, $bundle_vars{BUNDLE});
print Data::Dumper->Dump([ $bundle_info ], [ qw(bundle_info) ]);
if ($bundle_info->{status}) {