Author: lslezak Date: Wed Apr 30 15:28:14 2008 New Revision: 47232

URL: http://svn.opensuse.org/viewcvs/yast?rev=47232&view=rev Log: - don't show "Repository" menu in the package manager during installation (bnc#381956) - 2.16.43

Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_packages.ycp trunk/packager/src/clients/sw_single.ycp

Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=47232&r1... ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Apr 30 15:28:14 2008 @@ -1 +1 @@ -2.16.42 +2.16.43

Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.c... ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Apr 30 15:28:14 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 30 15:23:38 CEST 2008 - lslezak@suse.cz + +- don't show "Repository" menu in the package manager during + installation (bnc#381956) +- 2.16.43 + +------------------------------------------------------------------- Tue Apr 29 17:00:06 CEST 2008 - locilka@suse.cz

- Calling inst_extrasources in pkg_finish to get default

Modified: trunk/packager/src/clients/inst_packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_package... ============================================================================== --- trunk/packager/src/clients/inst_packages.ycp (original) +++ trunk/packager/src/clients/inst_packages.ycp Wed Apr 30 15:28:14 2008 @@ -22,7 +22,7 @@ * * Returns `accept or `cancel . **/ - symbol detailedSelection( symbol mode ) + symbol detailedSelection( symbol mode, boolean enable_repo_mgr ) { // Open an empty dialog for immediate feedback UI::OpenDialog(`opt(`defaultsize), @@ -35,8 +35,15 @@ // while the package manager is initialized UI::ReplaceWidget(`rep, mode == nil ? - `PackageSelector(`id(`packages ), "") : - `PackageSelector(`id(`packages ), `opt(mode), "") + (enable_repo_mgr ? + `PackageSelector(`id(`packages), `opt(`repoMgr), "") + : `PackageSelector(`id(`packages), "") + ) : + + (enable_repo_mgr ? + `PackageSelector(`id(`packages ), `opt(mode, `repoMgr), "") + : `PackageSelector(`id(`packages ), `opt(mode), "") + ) );

symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) ); @@ -57,7 +64,7 @@ if ( ! UI::HasSpecialWidget(`PatternSelector ) || UI::WizardCommand(`Ping() ) != true ) { - return detailedSelection( nil ); // Fallback: detailed selection + return detailedSelection( nil, !Stage::initial() ); // Fallback: detailed selection }

// Help text for software patterns / selections dialog @@ -112,7 +119,7 @@

if ( result == `details ) { - result = detailedSelection( nil ); + result = detailedSelection( nil, !Stage::initial() );

if ( result == `cancel ) // don't get all the way out - the user might just have @@ -151,11 +158,18 @@ symbol mode = (symbol) WFM::Args(0); y2milestone( "inst_packages called with: %1" , mode );

- result = detailedSelection( mode ); + boolean repo_mgr = false; + + if (size(WFM::Args()) > 1 && is( WFM::Args(1), symbol)) + { + repo_mgr = WFM::Args(1) == `repoMgr; + } + + result = detailedSelection( mode , repo_mgr ); } else { - result = detailedSelection( `searchMode ); + result = detailedSelection( `searchMode, false ); } }

Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.yc... ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Wed Apr 30 15:28:14 2008 @@ -383,7 +383,7 @@ // names of taboo packages list<string> taboo_packages = Pkg::GetPackages(`taboo, true);

- result = (symbol)WFM::CallFunction( "inst_packages", []); // No: ask user via package selection widget + result = (symbol)WFM::CallFunction( "inst_packages", [`searchMode, `repoMgr]); // No: ask user via package selection widget y2milestone ("inst_packages returns %1", result); if (result == `accept) {