Author: lslezak Date: Wed Jul 8 13:07:38 2009 New Revision: 57931 URL: http://svn.opensuse.org/viewcvs/yast?rev=57931&view=rev Log: - fixed another URL password logging into y2log (bnc#441944) - 2.13.183 Modified: branches/SuSE-SLE-10-SP3-Branch/packager/VERSION branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP3-Branch/packager/src/clients/inst_source.ycp branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packager/VERSION?rev=57931&r1=57930&r2=57931&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/VERSION Wed Jul 8 13:07:38 2009 @@ -1 +1 @@ -2.13.182 +2.13.183 Modified: branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes?rev=57931&r1=57930&r2=57931&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes Wed Jul 8 13:07:38 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 8 12:51:30 CEST 2009 - lslezak@suse.cz + +- fixed another URL password logging into y2log (bnc#441944) +- 2.13.183 + +------------------------------------------------------------------- Wed Apr 22 13:41:58 CEST 2009 - lslezak@suse.cz - callbacks - close download popup and source progress popup if Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/clients/inst_source.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packager/src/clients/inst_source.ycp?rev=57931&r1=57930&r2=57931&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/clients/inst_source.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/clients/inst_source.ycp Wed Jul 8 13:07:38 2009 @@ -32,6 +32,7 @@ import "Popup"; import "AddOnProduct"; import "Sequencer"; + import "InstURL"; // Do not sync the changes to ZENworks even if rug is present // This is handy for repairing an already out-of-sync situation @@ -128,7 +129,7 @@ } define symbol createSource( string url ) ``{ - y2milestone("createSource: %1", url); + y2milestone("createSource: %1", InstURL::HidePassword(url)); if ( url != "" ) { Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp?rev=57931&r1=57930&r2=57931&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp Wed Jul 8 13:07:38 2009 @@ -988,6 +988,10 @@ // error message // FIXME "ms" or plural gettext message = message + "\n" + sformat (_("Command timed out after %1 milliseconds."), ret["timed_out"]:1000); + + // replace password in the error message (bnc#441944#c28) + message = String::Replace(message, url, log_url); + Report::LongError (message); return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org