- don't append protocol when url name is fully qualified (for corporate)

- better user_agent for server side apps to handle different products (corporate, MNF)
- fixed empty message when update are done

3 files changed, 13 insertions, 5 deletions

diff --git a/mdkapplet b/mdkapplet
index 0efe0c67..b4a44b33 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -227,8 +227,8 @@ sub installUpdates {
     my $w = $in->wait_message(N("Please wait"), N("Check updates"));
     silentCheck(); gtkflush(); 
     undef $w;
-    my $mdkupdate_status = cat_('/tmp/mdkupdate.log');
-    if ($mdkupdate_status !~ /OK/) { logIt($mdkupdate_status); $in->ask_warn(N("Mandrakelinux Updates Applet"), $mdkupdate_status) }
+    my $mdkupdate_status = cat_('/var/tmp/mdkupdate.log');
+    if ($mdkupdate_status && $mdkupdate_status !~ /OK/) { logIt($mdkupdate_status); $in->ask_warn(N("Mandrakelinux Updates Applet"), $mdkupdate_status) }
 }
 sub silentCheck {
     my $link = $online_site . "/online3_RemoteAction.php" . '?action=UpdateList';
diff --git a/mdkonline.spec b/mdkonline.spec
index 5523f3b2..b4f5ded4 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -1,6 +1,6 @@
 %define version 1.1
 %define name mdkonline
-%define release 22mdk
+%define release 23mdk
 
 Summary:	The MandrakeOnline Tool  
 Name:		%{name}
@@ -113,7 +113,13 @@ rm -rf $RPM_BUILD_ROOT
 ##################################################################
 # get the source from our cvs repository (see
 # http://www.linuxmandrake.com/en/cvs.php3)
+
 %changelog
+* Wed Dec  8 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-23mdk
+- don't append protocol when url name is fully qualified (for corporate)
+- better user_agent for server side apps to handle different products (corporate, MNF)
+- fixed empty message when update are done
+
 * Mon Nov 29 2004 Frederic Lepied <flepied@mandrakesoft.com> 1.1-22mdk
 - use /corporate/ instead of /Corporate/ in update path.
 
diff --git a/mdkupdate b/mdkupdate
index fc00fa20..55d1521e 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -165,8 +165,10 @@ sub add_media {
     my $mirror = shift;
     my ($r) = mdkonline::get_release();
     my $dist_type = mdkonline::get_distro_type();
-    my $fullpath2mir = $r <= 10.0 ? "ftp://" . $mirror . if_($dist_type, "/$dist_type") ."/$r" . "/RPMS" . "/" :
-	"ftp://" . $mirror . "/$r" . "/main_updates" . "/";
+    #sometimes server returns the full link http:// or ftp://
+    my $no_full_path = $mirror !~ |^(http|ftp)://|;
+    my $fullpath2mir = $r <= 10.0 ? if_($no_full_path, "ftp://") . $mirror . if_($dist_type, "/$dist_type") ."/$r" . "/RPMS" . "/" :
+      "ftp://" . $mirror . "/$r" . "/main_updates" . "/";
     eval {
 	system "/usr/sbin/urpmi.removemedia", "mdkupdate";
 	system "/usr/sbin/urpmi.addmedia", "--update", "mdkupdate", $fullpath2mir, "with", $r <= 10.0 ? "../base/synthesis.hdlist.cz" : "media_info/synthesis.hdlist.cz";