Author: lslezak Date: Wed Aug 8 10:48:49 2007 New Revision: 40081 URL: http://svn.opensuse.org/viewcvs/yast?rev=40081&view=rev Log: - do not loose the repository name when adding has failed (#297774) - fixed repository editing when download has failed Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_source.ycp trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=40081&r1=40080&r2=40081&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Aug 8 10:48:49 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 8 10:45:35 CEST 2007 - lslezak@suse.cz + +- do not loose the repository name when adding has failed (#297774) +- fixed repository editing when download has failed + +------------------------------------------------------------------- Mon Aug 6 18:43:44 CEST 2007 - lslezak@suse.cz - properly detect ISO image (disable autorefresh) Modified: trunk/packager/src/clients/inst_source.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_source.ycp?rev=40081&r1=40080&r2=40081&view=diff ============================================================================== --- trunk/packager/src/clients/inst_source.ycp (original) +++ trunk/packager/src/clients/inst_source.ycp Wed Aug 8 10:48:49 2007 @@ -664,9 +664,12 @@ { map generalData = Pkg::SourceGeneralData( id ); string url = generalData[ "url" ]:""; + string old_url = url; boolean auto_refresh = sourceState["autorefresh"]:true; boolean plaindir = generalData["type"]:"YaST" == plaindir_type; + SourceDialogs::SetRepoName (sourceState["name"]:""); + do { // change schema if the repository type is plaindir // to show the right popup dialog @@ -676,8 +679,6 @@ parsed["scheme"] = "pkg"; url = URL::Build(parsed); } - SourceDialogs::SetRepoName (sourceState["name"]:""); - string old_url = url; url = editUrl( url ); if ( size( url ) == 0 ) break; @@ -876,7 +877,6 @@ symbol EditDialog() { - SourceDialogs::SetRepoName (""); symbol ret = SourceDialogs::EditDialog (); return ret; } Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialogs.ycp?rev=40081&r1=40080&r2=40081&view=diff ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Wed Aug 8 10:48:49 2007 @@ -1230,6 +1230,7 @@ void SelectStore (string key, map event) { _url = ""; + _repo_name = ""; symbol selected = (symbol)UI::QueryWidget (`id (`type), `CurrentButton); if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd, `local_dir, `specify__url, `slp, `local_iso], selected)) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org