March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56468 - /trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes
by kmachalkova＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: kmachalkova Date: Mon Mar 30 16:38:11 2009 New Revision: 56468 URL: http://svn.opensuse.org/viewcvs/yast?rev=56468&view=rev Log: changelog++ Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Mon Mar 30 16:38:11 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 30 16:04:53 CEST 2009 - kmachalkova(a)suse.cz + +- Do not implicitly search for matching keywords (added a new switch + into search options to include/exclude keywords) (bnc#470069) + +------------------------------------------------------------------- Thu Mar 19 14:49:36 CET 2009 - gs(a)suse.de - Add name of source package to technical details view -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56467 - /trunk/pkg-bindings/src/Source_Get.cc
by lslezak＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: lslezak Date: Mon Mar 30 16:32:58 2009 New Revision: 56467 URL: http://svn.opensuse.org/viewcvs/yast?rev=56467&view=rev Log: - return "is_update_repo" flag in Pkg::SourceGeneralData() call (requires loaded pool) (bnc#459527) Modified: trunk/pkg-bindings/src/Source_Get.cc Modified: trunk/pkg-bindings/src/Source_Get.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Get.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Source_Get.cc (original) +++ trunk/pkg-bindings/src/Source_Get.cc Mon Mar 30 16:32:58 2009 @@ -30,6 +30,7 @@ #include "ycpTools.h" #include <zypp/Product.h> +#include <zypp/Repository.h> #include <zypp/media/CredentialManager.h> #include <ycp/YCPBoolean.h> @@ -112,6 +113,7 @@ * "name" : YCPString, * "service" : YCPString, (service to which the repo belongs, empty if there is no service assigned) * "keeppackages" : YCPBoolean, + * "is_update_repo" : YCPBoolean, (true if this is an update repo - this requires loaded objects in pool otherwise the flag is not returned! The value is stored in repo metadata, not in .repo file!) * ]; * * </code> @@ -159,6 +161,15 @@ data->add( YCPString("keeppackages"), YCPBoolean(repo->repoInfo().keepPackages())); + // add Repository data + zypp::Repository repository(zypp::ResPool::instance().reposFind(repo->repoInfo().alias())); + + if (repository != zypp::Repository::noRepository) + { + y2debug("adding zypp::Repository info"); + data->add( YCPString("is_update_repo"), YCPBoolean(repository.isUpdateRepo())); + } + return data; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56466 - /tags/stable-2_18_1/samba-server/
by locilka＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: locilka Date: Mon Mar 30 16:24:51 2009 New Revision: 56466 URL: http://svn.opensuse.org/viewcvs/yast?rev=56466&view=rev Log: Created tag stable-2_18_1 for samba-server Added: tags/stable-2_18_1/samba-server/ - copied from r56465, trunk/samba-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56465 - /tags/branch-Code-11-2_17_9/samba-server/
by locilka＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: locilka Date: Mon Mar 30 16:03:55 2009 New Revision: 56465 URL: http://svn.opensuse.org/viewcvs/yast?rev=56465&view=rev Log: Created tag branch-Code-11-2_17_9 for samba-server Added: tags/branch-Code-11-2_17_9/samba-server/ - copied from r56464, branches/SuSE-Code-11-Branch/samba-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56464 - in /trunk/ncurses-pkg/src: NCPkgFilterSearch.cc NCPkgFilterSearch.h
by kmachalkova＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: kmachalkova Date: Mon Mar 30 16:01:12 2009 New Revision: 56464 URL: http://svn.opensuse.org/viewcvs/yast?rev=56464&view=rev Log: Exclude pkgs with matching keywords from search results, unless specifically requested (#470069) Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgFilterSearch.h Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Mon Mar 30 16:01:12 2009 @@ -162,6 +162,7 @@ bool NCPkgFilterSearch::fillSearchList( string & expr, bool ignoreCase, bool checkName, + bool checkKeywords, bool checkSummary, bool checkDescr, bool checkProvides, @@ -201,8 +202,6 @@ q.addString( expr ); q.addKind( zypp::ResKind::package ); - //no clue what this means, but it segfaults if it's not here :) - q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( !ignoreCase ) q.setCaseSensitive(); @@ -210,6 +209,8 @@ q.addAttribute( zypp::sat::SolvAttr::name ); if ( checkSummary ) q.addAttribute( zypp::sat::SolvAttr::summary ); + if ( checkKeywords ) + q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( checkDescr ) q.addAttribute( zypp::sat::SolvAttr::description ); if ( checkProvides ) @@ -271,14 +272,14 @@ if ( !packager->isYouMode() ) { // fill the package list with packages matching the search expression - fillSearchList( filter, - getCheckBoxValue( ignoreCase ), - settings->doCheckName(), - settings->doCheckSummary(), - settings->doCheckDescr(), - settings->doCheckProvides(), - settings->doCheckRequires() - ); + fillSearchList( filter, getCheckBoxValue( ignoreCase ), + settings->doCheckName(), + settings->doCheckSummary(), + settings->doCheckKeywords(), + settings->doCheckDescr(), + settings->doCheckProvides(), + settings->doCheckRequires() + ); } else { Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.h Mon Mar 30 16:01:12 2009 @@ -83,6 +83,7 @@ bool fillSearchList( string & expr, bool ignoreCase, bool checkName, + bool checkKeywords, bool checkSummary, bool checkDescr, bool checkProvides, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56463 - in /branches/SuSE-Code-11-Branch/samba-server: VERSION package/yast2-samba-server.changes src/dialogs.ycp
by locilka＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: locilka Date: Mon Mar 30 16:01:05 2009 New Revision: 56463 URL: http://svn.opensuse.org/viewcvs/yast?rev=56463&view=rev Log: - Enabling all expert settings that were hidden because of obsolete globals->ui_mode control file option (bnc #480820). - 2.18.1 Modified: branches/SuSE-Code-11-Branch/samba-server/VERSION branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-Branch/samba-server/src/dialogs.ycp Modified: branches/SuSE-Code-11-Branch/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/VERSION (original) +++ branches/SuSE-Code-11-Branch/samba-server/VERSION Mon Mar 30 16:01:05 2009 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes Mon Mar 30 16:01:05 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 30 15:58:03 CEST 2009 - locilka(a)suse.cz + +- Enabling all expert settings that were hidden because of obsolete + globals->ui_mode control file option (bnc #480820). +- 2.17.9 + +------------------------------------------------------------------- Fri Jan 16 13:35:48 CET 2009 - locilka(a)suse.cz - Enabling the UsersPlugin* for all configurations (bnc #460555). Modified: branches/SuSE-Code-11-Branch/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-Branch/samba-server/src/dialogs.ycp Mon Mar 30 16:01:05 2009 @@ -139,7 +139,6 @@ string workgroup = SambaConfig::GlobalGetStr("workgroup", ""); boolean has_pdc = SambaNmbLookup::HasPDC(workgroup); boolean has_bdc = SambaNmbLookup::HasBDC(workgroup); - boolean simple = ProductFeatures::GetFeature("globals", "ui_mode") == "simple"; term contents = `VBox( //header of status-like information. followed by domain name @@ -153,23 +152,21 @@ `HSpacing(4), // appears on new line after Primary Domain Controller radio button `Left(`Label(has_pdc?_("Not available because a PDC is present."):""))), - (simple ? `Empty() : `VBox( + `VBox( `Left(`RadioButton(`id("BDC"), bdc, false)), `HBox( `HSpacing(4), - `Left(`Label(""))))), + `Left(`Label(""))) + ), `Left(`RadioButton(`id ("Standalone"), standalone, has_pdc)), `VSpacing(1)))))), `VStretch()); - string help = simple ? HELPS["inst_step2_no_bdc"]:"" : HELPS["inst_step2"]:""; + string help = HELPS["inst_step2"]:""; Wizard::SetContents( caption, contents, help, true, true ); UI::ChangeWidget(`id(`pdc), `Enabled, !has_pdc); -// if (simple) { -// UI::ChangeWidget(`id(`bdc), `Enabled, true); -// } any ret = nil; while(true) { @@ -217,14 +214,12 @@ void WinsSettingsWidgetInit(string key) { - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { boolean wins = SambaConfig::GlobalGetTruth("wins support", false); UI::ChangeWidget(`id("wins_server_support"), `Value, wins); UI::ChangeWidget(`id("remote_wins_server"), `Value, ! wins); UI::ChangeWidget(`id("wins_server_name"), `Enabled, ! wins); UI::ChangeWidget(`id("wins_server_name"), `Value, SambaConfig::GlobalGetStr("wins server","")); - } } void WinsViaDHCPWidgetInit (string key) { @@ -263,7 +258,6 @@ void WinsSettingsWidgetStore(string key, map event_descr) { - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { if ( (boolean)UI::QueryWidget(`id("wins_server_support"), `Value)) { y2milestone("Enabling wins support"); SambaConfig::GlobalSetTruth("wins support", true); @@ -273,7 +267,6 @@ SambaConfig::GlobalSetStr("wins server", (string)UI::QueryWidget(`id("wins_server_name"), `Value)); y2milestone("Disabling wins support, using server '%1'", SambaConfig::GlobalGetStr("wins server", "<none>")); } - } } void WinsViaDHCPWidgetStore (string key, map event_descr) { @@ -308,12 +301,10 @@ symbol WinsSettingsWidgetHandle(string key, map event_descr) { - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { any event = event_descr["ID"]:nil; if ( event == "wins_server_support" || event == "remote_wins_server" ) { UI::ChangeWidget(`id("wins_server_name"), `Enabled, event == "remote_wins_server"); } - } return nil; } @@ -853,10 +844,8 @@ `item(`id("PDC"), _("Primary (PDC)")) ]; - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { // translators: combobox item roles = add( roles, `item ( `id("BDC"), _("Backup (BDC)") )); - } term basesettings_widget = `Frame(_("Base Settings"), `HBox( `HSpacing(1), @@ -930,23 +919,6 @@ `HWeight(1, `Empty()), `HWeight(100, `VBox( `VSpacing(0.5), - (ProductFeatures::GetFeature("globals", "ui_mode") == "simple" ? - `HBox ( - `HWeight ( - 50, `VBox ( - "BASE SETTINGS", - `VSpacing (1), - "netbios name", - "WINS via DHCP", - "WINS Host Resolution", - "ADVANCED SETTINGS" - ) - ), - `HWeight ( - 50, `Empty () - ) - ) - : `VBox ( `HBox ( `HWeight (1, @@ -973,8 +945,7 @@ `HSpacing(0.5), `HWeight (1, `Empty ()) ) - ) - ), + ), `VStretch()) ), `HWeight(1, `Empty()) @@ -983,7 +954,6 @@ ] ]; - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { tabs_descr = union(tabs_descr, $[ "trusted_domains_tab": $[ "header": _("&Trusted Domains"), @@ -996,7 +966,6 @@ "widget_names": ["LDAP ESSENTIAL"] ] ]); - } map tabs_widget_descr = $[ "SERVICE START": CWMServiceStart::CreateAutoStartWidget($[ @@ -1024,7 +993,7 @@ "BASE SETTINGS": $[ "widget" : `custom, "custom_widget" : basesettings_widget, - "help": ProductFeatures::GetFeature("globals", "ui_mode") == "simple" ? HELPS["smb_conf_tab_base_settings_no_bdc"]:"" : HELPS["smb_conf_tab_base_settings"]:"", + "help": HELPS["smb_conf_tab_base_settings"]:"", "init": BaseSettingsWidgetInit, "store": BaseSettingsWidgetStore, ], @@ -1075,9 +1044,7 @@ map widget_descr = $[ "tab": CWMTab::CreateWidget($[ - "tab_order": ProductFeatures::GetFeature("globals", "ui_mode") != "simple" ? - ["startup", "shares", "identity", "trusted_domains_tab", "ldap_settings_tab"] : - ["startup", "shares", "identity"], + "tab_order": ["startup", "shares", "identity", "trusted_domains_tab", "ldap_settings_tab"], "tabs": tabs_descr, "widget_descr": tabs_widget_descr, "initial_tab" : return_tab, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56462 - in /trunk/samba-server: VERSION package/yast2-samba-server.changes src/dialogs.ycp
by locilka＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: locilka Date: Mon Mar 30 16:00:48 2009 New Revision: 56462 URL: http://svn.opensuse.org/viewcvs/yast?rev=56462&view=rev Log: - Enabling all expert settings that were hidden because of obsolete globals->ui_mode control file option (bnc #480820). - 2.18.1 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/dialogs.ycp Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=56462&r… ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Mon Mar 30 16:00:48 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Mar 30 16:00:48 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 30 15:58:03 CEST 2009 - locilka(a)suse.cz + +- Enabling all expert settings that were hidden because of obsolete + globals->ui_mode control file option (bnc #480820). +- 2.18.1 + +------------------------------------------------------------------- Fri Jan 16 13:35:48 CET 2009 - locilka(a)suse.cz - Enabling the UsersPlugin* for all configurations (bnc #460555). Modified: trunk/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/dialogs.ycp?rev… ============================================================================== --- trunk/samba-server/src/dialogs.ycp (original) +++ trunk/samba-server/src/dialogs.ycp Mon Mar 30 16:00:48 2009 @@ -139,7 +139,6 @@ string workgroup = SambaConfig::GlobalGetStr("workgroup", ""); boolean has_pdc = SambaNmbLookup::HasPDC(workgroup); boolean has_bdc = SambaNmbLookup::HasBDC(workgroup); - boolean simple = ProductFeatures::GetFeature("globals", "ui_mode") == "simple"; term contents = `VBox( //header of status-like information. followed by domain name @@ -153,23 +152,21 @@ `HSpacing(4), // appears on new line after Primary Domain Controller radio button `Left(`Label(has_pdc?_("Not available because a PDC is present."):""))), - (simple ? `Empty() : `VBox( + `VBox( `Left(`RadioButton(`id("BDC"), bdc, false)), `HBox( `HSpacing(4), - `Left(`Label(""))))), + `Left(`Label(""))) + ), `Left(`RadioButton(`id ("Standalone"), standalone, has_pdc)), `VSpacing(1)))))), `VStretch()); - string help = simple ? HELPS["inst_step2_no_bdc"]:"" : HELPS["inst_step2"]:""; + string help = HELPS["inst_step2"]:""; Wizard::SetContents( caption, contents, help, true, true ); UI::ChangeWidget(`id(`pdc), `Enabled, !has_pdc); -// if (simple) { -// UI::ChangeWidget(`id(`bdc), `Enabled, true); -// } any ret = nil; while(true) { @@ -217,14 +214,12 @@ void WinsSettingsWidgetInit(string key) { - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { boolean wins = SambaConfig::GlobalGetTruth("wins support", false); UI::ChangeWidget(`id("wins_server_support"), `Value, wins); UI::ChangeWidget(`id("remote_wins_server"), `Value, ! wins); UI::ChangeWidget(`id("wins_server_name"), `Enabled, ! wins); UI::ChangeWidget(`id("wins_server_name"), `Value, SambaConfig::GlobalGetStr("wins server","")); - } } void WinsViaDHCPWidgetInit (string key) { @@ -263,7 +258,6 @@ void WinsSettingsWidgetStore(string key, map event_descr) { - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { if ( (boolean)UI::QueryWidget(`id("wins_server_support"), `Value)) { y2milestone("Enabling wins support"); SambaConfig::GlobalSetTruth("wins support", true); @@ -273,7 +267,6 @@ SambaConfig::GlobalSetStr("wins server", (string)UI::QueryWidget(`id("wins_server_name"), `Value)); y2milestone("Disabling wins support, using server '%1'", SambaConfig::GlobalGetStr("wins server", "<none>")); } - } } void WinsViaDHCPWidgetStore (string key, map event_descr) { @@ -308,12 +301,10 @@ symbol WinsSettingsWidgetHandle(string key, map event_descr) { - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { any event = event_descr["ID"]:nil; if ( event == "wins_server_support" || event == "remote_wins_server" ) { UI::ChangeWidget(`id("wins_server_name"), `Enabled, event == "remote_wins_server"); } - } return nil; } @@ -853,10 +844,8 @@ `item(`id("PDC"), _("Primary (PDC)")) ]; - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { // translators: combobox item roles = add( roles, `item ( `id("BDC"), _("Backup (BDC)") )); - } term basesettings_widget = `Frame(_("Base Settings"), `HBox( `HSpacing(1), @@ -930,23 +919,6 @@ `HWeight(1, `Empty()), `HWeight(100, `VBox( `VSpacing(0.5), - (ProductFeatures::GetFeature("globals", "ui_mode") == "simple" ? - `HBox ( - `HWeight ( - 50, `VBox ( - "BASE SETTINGS", - `VSpacing (1), - "netbios name", - "WINS via DHCP", - "WINS Host Resolution", - "ADVANCED SETTINGS" - ) - ), - `HWeight ( - 50, `Empty () - ) - ) - : `VBox ( `HBox ( `HWeight (1, @@ -973,8 +945,7 @@ `HSpacing(0.5), `HWeight (1, `Empty ()) ) - ) - ), + ), `VStretch()) ), `HWeight(1, `Empty()) @@ -983,7 +954,6 @@ ] ]; - if (ProductFeatures::GetFeature("globals", "ui_mode") != "simple") { tabs_descr = union(tabs_descr, $[ "trusted_domains_tab": $[ "header": _("&Trusted Domains"), @@ -996,7 +966,6 @@ "widget_names": ["LDAP ESSENTIAL"] ] ]); - } map tabs_widget_descr = $[ "SERVICE START": CWMServiceStart::CreateAutoStartWidget($[ @@ -1024,7 +993,7 @@ "BASE SETTINGS": $[ "widget" : `custom, "custom_widget" : basesettings_widget, - "help": ProductFeatures::GetFeature("globals", "ui_mode") == "simple" ? HELPS["smb_conf_tab_base_settings_no_bdc"]:"" : HELPS["smb_conf_tab_base_settings"]:"", + "help": HELPS["smb_conf_tab_base_settings"]:"", "init": BaseSettingsWidgetInit, "store": BaseSettingsWidgetStore, ], @@ -1075,9 +1044,7 @@ map widget_descr = $[ "tab": CWMTab::CreateWidget($[ - "tab_order": ProductFeatures::GetFeature("globals", "ui_mode") != "simple" ? - ["startup", "shares", "identity", "trusted_domains_tab", "ldap_settings_tab"] : - ["startup", "shares", "identity"], + "tab_order": ["startup", "shares", "identity", "trusted_domains_tab", "ldap_settings_tab"], "tabs": tabs_descr, "widget_descr": tabs_widget_descr, "initial_tab" : return_tab, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56461 - in /trunk/ncurses-pkg/src: NCPkgSearchSettings.cc NCPkgSearchSettings.h
by kmachalkova＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: kmachalkova Date: Mon Mar 30 15:20:07 2009 New Revision: 56461 URL: http://svn.opensuse.org/viewcvs/yast?rev=56461&view=rev Log: Keywords search option added Modified: trunk/ncurses-pkg/src/NCPkgSearchSettings.cc trunk/ncurses-pkg/src/NCPkgSearchSettings.h Modified: trunk/ncurses-pkg/src/NCPkgSearchSettings.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSearchSetti… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgSearchSettings.cc (original) +++ trunk/ncurses-pkg/src/NCPkgSearchSettings.cc Mon Mar 30 15:20:07 2009 @@ -40,6 +40,8 @@ items.push_back (checkName); checkSummary = new YItem ( _( "Summary" ), true); items.push_back (checkSummary); + checkKeywords = new YItem ( _( "Keywords" )); + items.push_back (checkKeywords); checkDescr = new YItem ( _( "Description (time-consuming)" )); items.push_back (checkDescr); checkProvides = new YItem ( _( "Provides" )); @@ -58,6 +60,10 @@ { return checkSummary->selected(); } +bool NCPkgSearchSettings::doCheckKeywords() +{ + return checkKeywords->selected(); +} bool NCPkgSearchSettings::doCheckDescr() { return checkDescr->selected(); Modified: trunk/ncurses-pkg/src/NCPkgSearchSettings.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSearchSetti… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgSearchSettings.h (original) +++ trunk/ncurses-pkg/src/NCPkgSearchSettings.h Mon Mar 30 15:20:07 2009 @@ -35,6 +35,7 @@ YItemCollection items; YItem *checkName; YItem *checkSummary; + YItem *checkKeywords; YItem *checkDescr; YItem *checkProvides; YItem *checkRequires; @@ -47,6 +48,7 @@ bool doCheckName(); bool doCheckSummary(); + bool doCheckKeywords(); bool doCheckDescr(); bool doCheckProvides(); bool doCheckRequires(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56460 - in /trunk/packager: package/yast2-packager.changes src/clients/sw_single.ycp
by lslezak＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: lslezak Date: Mon Mar 30 15:02:00 2009 New Revision: 56460 URL: http://svn.opensuse.org/viewcvs/yast?rev=56460&view=rev Log: - sw_single - display the installation summary when there is something to install/remove at start (bnc#465194) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Mar 30 15:02:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 30 14:41:21 CEST 2009 - lslezak(a)suse.cz + +- sw_single - display the installation summary when there is + something to install/remove at start (bnc#465194) + +------------------------------------------------------------------- Tue Mar 17 13:43:09 CET 2009 - lslezak(a)suse.cz - Removed ZMD synchronization option, ZMD cannot sychronize Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.y… ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Mon Mar 30 15:02:00 2009 @@ -310,7 +310,7 @@ return !max_is_installed; } - map GetPackagerOptions() + map<string, any> GetPackagerOptions() { // defaults symbol mode = nil; @@ -340,16 +340,18 @@ // use default parameters for missing or invalid values if (mode == nil) { - mode = `searchMode; + // use summary mode if there is something to install (probably a suggested or recommended package) (bnc#465194) + Pkg::PkgSolve(true); // select the packages + mode = (Pkg::IsAnyResolvable(`any, `to_install) || Pkg::IsAnyResolvable(`any, `to_remove)) ? `summaryMode : `searchMode; } if (repo_management == nil) { repo_management = Mode::normal(); } - map ret = $[ "dialog_type" : mode, "repo_mgmt" : repo_management ]; + map<string, any> ret = $[ "mode" : mode, "repo_mgmt" : repo_management ]; - y2milestone("inst_packages config: %1", ret); + y2milestone("PackagesUI::RunPackageSelector() options: %1", ret); return ret; } @@ -426,10 +428,10 @@ // names of taboo packages list<string> taboo_packages = Pkg::GetPackages(`taboo, true); - map opts = GetPackagerOptions(); + map<string,any> opts = GetPackagerOptions(); y2milestone("Using packager widget options: %1", opts); - result = (symbol)WFM::CallFunction( "inst_packages", [opts]); // No: ask user via package selection widget + result = PackagesUI::RunPackageSelector(opts); // No: ask user via package selection widget y2milestone ("inst_packages returns %1", result); if (result == `accept) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56459 - /tags/stable-2_18_12/installation/
by locilka＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: locilka Date: Mon Mar 30 14:27:07 2009 New Revision: 56459 URL: http://svn.opensuse.org/viewcvs/yast?rev=56459&view=rev Log: Created tag stable-2_18_12 for installation Added: tags/stable-2_18_12/installation/ - copied from r56458, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0