Author: coolo Date: Sun Nov 9 11:51:18 2008 New Revision: 53118 URL: http://svn.opensuse.org/viewcvs/yast?rev=53118&view=rev Log: fix testsuite Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/InstURL.ycp trunk/packager/src/modules/Packages.ycp trunk/packager/src/modules/SourceManager.ycp trunk/packager/testsuite/manual-tests/test_url.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=53118&r1=53117&r2=53118&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Sun Nov 9 11:51:18 2008 @@ -1 +1 @@ -2.17.40 +2.17.41 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=53118&r1=53117&r2=53118&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Sun Nov 9 11:51:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Nov 9 11:50:55 CET 2008 - coolo@suse.de + +- do not use InstURL::HidePassword to avoid warnings +- 2.17.41 + +------------------------------------------------------------------- Fri Nov 7 13:26:09 CET 2008 - lslezak@suse.cz - fixed URL logging (bnc#441944) Modified: trunk/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/InstURL.ycp?rev=53118&r1=53117&r2=53118&view=diff ============================================================================== --- trunk/packager/src/modules/InstURL.ycp (original) +++ trunk/packager/src/modules/InstURL.ycp Sun Nov 9 11:51:18 2008 @@ -128,7 +128,7 @@ repo_url = Linuxrc::InstallInf (in_inf_key); if (repo_url != nil && repo_url != "") { - y2milestone ("Using %1 directly from install.inf: %2", in_inf_key, HidePassword (repo_url)); + y2milestone ("Using %1 directly from install.inf: %2", in_inf_key, URL::HidePassword (repo_url)); repo_url_from_inf = true; break; } @@ -336,7 +336,7 @@ url = sformat ("iso:/?iso=%1&url=%2", isoimg, url); } - y2debug ("URL %1", HidePassword(url)); + y2debug ("URL %1", URL::HidePassword(url)); return url; } } Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=53118&r1=53117&r2=53118&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Sun Nov 9 11:51:18 2008 @@ -997,7 +997,7 @@ { string msg = sformat( _("Unable to create repository -from URL '%1'."), InstURL::HidePassword(url) ) + "\n\n" + _("Details:") +from URL '%1'."), URL::HidePassword(url) ) + "\n\n" + _("Details:") + "\n" + Pkg::LastError() + "\n\n" + _("Try again?"); if (Popup::YesNo (msg)) @@ -1008,7 +1008,7 @@ { // error in proposal, %1 is URL init_error = sformat (_("No repository found at '%1'."), - InstURL::HidePassword (url)); + URL::HidePassword (url)); return ""; } } @@ -1308,7 +1308,7 @@ } // hide password from URL if present - log_url = InstURL::HidePassword(base_url); + log_url = URL::HidePassword(base_url); y2milestone ("Initialize Package Manager: %1", log_url); // Set languages for packagemanager. Always set the UI language. Set @@ -1420,7 +1420,7 @@ || (substring (url, 0, 3) == "dvd")) { string new_url = InstURL::RewriteCDUrl(url); - y2milestone ("rewrite url: '%1'->'%2'", url, InstURL::HidePassword(new_url)); + y2milestone ("rewrite url: '%1'->'%2'", url, URL::HidePassword(new_url)); Pkg::SourceChangeUrl (source, new_url); } }); Modified: trunk/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceManager.ycp?rev=53118&r1=53117&r2=53118&view=diff ============================================================================== --- trunk/packager/src/modules/SourceManager.ycp (original) +++ trunk/packager/src/modules/SourceManager.ycp Sun Nov 9 11:51:18 2008 @@ -425,7 +425,7 @@ if ( size( newSources ) == 0 ) { string _msg1 = sformat( _("Unable to create repository -from URL '%1'."), InstURL::HidePassword(url) ); +from URL '%1'."), URL::HidePassword(url) ); string _msg2 = _("Details:") + "\n" + Pkg::LastError(); // end of popup message, question @@ -834,7 +834,7 @@ // really individual lines? known_urls = (list <string>) ret["stdout"]:[]; list<string> log_known_urls = maplist (string u, known_urls, ``( - InstURL::HidePassword(u) + URL::HidePassword(u) )); y2milestone ("known %1", log_known_urls); } @@ -874,7 +874,7 @@ string stype = gendata["type"]:""; // metadata type if (stype == "YaST") stype = "zypp"; /* 'rug' only accepts yum or zypp */ string url = gendata["url"]:""; - string log_url = InstURL::HidePassword (url); + string log_url = URL::HidePassword (url); // ZMD must have unique URIs, so we append the alias string alias = gendata["alias"]:""; @@ -898,7 +898,7 @@ string test_url = URL::Build (parsed_url); url = test_url; } - log_url = InstURL::HidePassword (url); + log_url = URL::HidePassword (url); y2milestone ("zmd url: %1", log_url); // we're done if known and adding or unknown and deleting. Modified: trunk/packager/testsuite/manual-tests/test_url.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/manual-tests/test_url.ycp?rev=53118&r1=53117&r2=53118&view=diff ============================================================================== --- trunk/packager/testsuite/manual-tests/test_url.ycp (original) +++ trunk/packager/testsuite/manual-tests/test_url.ycp Sun Nov 9 11:51:18 2008 @@ -1,6 +1,6 @@ { import "InstURL"; string url = InstURL::installInf2Url(""); - string log_url = InstURL::HidePassword(url); + string log_url = URL::HidePassword(url); y2milestone("URL %1", url ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org