Author: lslezak Date: Thu Apr 23 15:21:32 2009 New Revision: 56934 URL: http://svn.opensuse.org/viewcvs/yast?rev=56934&view=rev Log: - display an additional help when adding an ISO repository over FTP or HTTP protocol fails (bnc#341668) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=56934&r1=56933&r2=56934&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Apr 23 15:21:32 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 23 15:19:17 CEST 2009 - lslezak@suse.cz + +- display an additional help when adding an ISO repository over + FTP or HTTP protocol fails (bnc#341668) + +------------------------------------------------------------------- Tue Apr 21 15:34:48 CEST 2009 - lslezak@suse.cz - Append additional RPM output to the installation log only if it Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositories_include.ycp?rev=56934&r1=56933&r2=56934&view=diff ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Thu Apr 23 15:21:32 2009 @@ -270,6 +270,18 @@ // popup message part 1 string _msg1 = sformat( _("Unable to create repository from URL '%1'."), URL::HidePassword(url) ); + + if (regexpmatch(url, "\\.iso$")) + { + map parsed_url = URL::Parse(url); + string scheme = tolower(parsed_url["scheme"]:""); + + if (contains(["ftp", "http", "https"], scheme)) + { + // error message + _msg1 = _msg1 + "\n\n" + _("Using an ISO image over ftp or http(s) protocol is not possible.\nChange the protocol or unpack the ISO image on the server side."); + } + } // popup message part 2 string _msg2 = _("Try again?"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org