summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmdkonline12
-rw-r--r--mdkonline.pm4
-rw-r--r--mdkonline.spec9
3 files changed, 17 insertions, 8 deletions
diff --git a/mdkonline b/mdkonline
index f24ef0e6..cbcec800 100755
--- a/mdkonline
+++ b/mdkonline
@@ -188,10 +188,14 @@ $wiz = {
}
},
post => sub {
- mdkonline::automated_upgrades($conffile, $login, md5_hex($password), $boxname, $key, $country, 'TRUE');
- mdkonline::write_wide_conf($login, $boxname, $country);
- mdkonline::clean_confdir();
- "end"
+ if ($sendconfres eq 'TRUE' && $key) {
+ mdkonline::automated_upgrades($conffile, $login, md5_hex($password), $boxname, $key, $country, 'TRUE');
+ mdkonline::write_wide_conf($login, $boxname, $country);
+ mdkonline::clean_confdir();
+ "end"
+ } else {
+ "authenticate"
+ }
},
},
end => {
diff --git a/mdkonline.pm b/mdkonline.pm
index b33a3de8..af2b3eb0 100644
--- a/mdkonline.pm
+++ b/mdkonline.pm
@@ -24,7 +24,7 @@ sub get_release() {
sub get_distro_type() {
my $d;
- cat_($release_file) =~ /(corporate|mnf)/i, and $d = $1;
+ cat_($release_file) =~ /(corporate|mnf)/i, and $d = lc($1);
$d
}
@@ -213,7 +213,7 @@ sub write_wide_conf {
my $wideconf = '/etc/sysconfig/mdkonline';
my $d = localtime();
$d =~ s/\s+/_/g;
- output_with_perm $wideconf, 644,
+ output_with_perm $wideconf, 0644,
qq(LOGIN=$login
MACHINE=$boxname
COUNTRY=$country
diff --git a/mdkonline.spec b/mdkonline.spec
index 0ddd5f7a..526380d5 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -1,6 +1,6 @@
%define version 1.1
%define name mdkonline
-%define release 25mdk
+%define release 26mdk
Summary: The MandrakeOnline Tool
Name: %{name}
@@ -13,7 +13,7 @@ Group: System/Configuration/Other
Requires: drakxtools-newt, perl-Gtk2-TrayIcon >= 0.03-3mdk, perl-Crypt-SSLeay >= 0.51-2mdk
Provides: %{name}-backend
Obsoletes: %{name}-backend
-Requires: hwdb-clients >= 0.15.1-1mdk
+Requires: hwdb-clients >= 0.15.1-1mdk
BuildRequires: gettext, perl-MDK-Common-devel
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildArch: noarch
@@ -115,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT
# http://www.linuxmandrake.com/en/cvs.php3)
%changelog
+* Thu Dec 23 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-26mdk
+- fixed permissions of generated conf file (use octal with perl chmod)
+- do not go to 'End' step when upload fails, give choice to user
+ to reupload their config
+
* Fri Dec 10 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-25mdk
- fix typo when --debug is passed to mdkapplet (warly)