Author: lslezak Date: Mon Sep 3 10:49:17 2007 New Revision: 40681 URL: http://svn.opensuse.org/viewcvs/yast?rev=40681&view=rev Log: - try HTTP scheme when registering an FTP update source fails due to too restrictive firewall (#227059) - 2.15.72 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceManager.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40681&r1=40680&r2=40681&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Sep 3 10:49:17 2007 @@ -1 +1 @@ -2.15.71 +2.15.72 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=40681&r1=40680&r2=40681&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Sep 3 10:49:17 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 3 10:41:35 CEST 2007 - lslezak@suse.cz + +- try HTTP scheme when registering an FTP update source fails due + to too restrictive firewall (#227059) +- 2.15.72 + +------------------------------------------------------------------- Mon Sep 3 09:44:32 CEST 2007 - locilka@suse.cz - Added support for LiveCD installation into ProductLicense module Modified: trunk/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceManager.ycp?rev=40681&r1=40680&r2=40681&view=diff ============================================================================== --- trunk/packager/src/modules/SourceManager.ycp (original) +++ trunk/packager/src/modules/SourceManager.ycp Mon Sep 3 10:49:17 2007 @@ -1286,8 +1286,26 @@ Pkg::SourceDelete (todel); } // then add the new one - y2milestone ("adding repository"); + y2milestone ("Adding update repository..."); integer toadd = Pkg::SourceCreate (url, "/"); + + // adding failed, try http fallback for ftp repo (#227059) + if (toadd == nil || toadd < 0) + { + map parsed_url = URL::Parse(url); + string scheme = parsed_url["scheme"]:""; + + if (tolower(scheme) == "ftp") + { + y2milestone("Cannot add FTP update repository, trying HTTP..."); + + parsed_url["scheme"] = "http"; + string fallback_url = URL::Build(parsed_url); + + toadd = Pkg::SourceCreate (fallback_url, "/"); + } + } + // and add to ZENworks too, but only if it succeeded here (#180820) if (toadd != -1 && toadd != nil) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org