October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51734 - /trunk/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:50:05 2008 New Revision: 51734 URL: http://svn.opensuse.org/viewcvs/yast?rev=51734&view=rev Log: Include also *.ybc files in the final RPM Modified: trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=51… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Wed Oct 1 13:50:05 2008 @@ -7,7 +7,7 @@ BuildArchitectures: noarch -Summary: YaST - Product Migration Workflow +Summary: YaST2 - Product Migration Workflow %description - @@ -24,6 +24,7 @@ %defattr(-,root,root) @clientdir@/*.ycp @moduledir@/*.ycp +@moduledir@/*.ybc %dir /usr/share/YaST2/control /usr/share/YaST2/control/online_migration.xml %doc @docdir@ -- 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] r51733 - in /trunk/installation: control/control.SLES.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:43:04 2008 New Revision: 51733 URL: http://svn.opensuse.org/viewcvs/yast?rev=51733&view=rev Log: - Changing pattern "Documentation" to "documentation" (bnc #431218) Modified: trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Wed Oct 1 13:43:04 2008 @@ -123,7 +123,7 @@ <system_scenarios config:type="list"> <system_scenario> <id>scenario_physical_machine</id> - <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 Documentation</patterns> + <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 documentation</patterns> <icon>yast-system</icon> </system_scenario> <system_scenario> @@ -133,7 +133,7 @@ </system_scenario> <system_scenario> <id>scenario_virtualization_host</id> - <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 Documentation</patterns> + <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 documentation</patterns> <icon>yast-vm-management</icon> </system_scenario> </system_scenarios> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Oct 1 13:43:04 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 13:42:18 CEST 2008 - locilka(a)suse.cz + +- Changing pattern "Documentation" to "documentation" (bnc #431218) + +------------------------------------------------------------------- Tue Sep 30 13:20:09 CEST 2008 - locilka(a)suse.cz - Replacing "networkmanager" proposal call with "general" -- 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] r51732 - /tags/stable-2_17_0/wagon/
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:37:27 2008 New Revision: 51732 URL: http://svn.opensuse.org/viewcvs/yast?rev=51732&view=rev Log: Er, grf Removed: tags/stable-2_17_0/wagon/ -- 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] r51731 - in /trunk/packager/src: clients/repositories.ycp include/repositories_include.ycp
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 13:35:24 2008 New Revision: 51731 URL: http://svn.opensuse.org/viewcvs/yast?rev=51731&view=rev Log: - better support for services Modified: trunk/packager/src/clients/repositories.ycp trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 13:35:24 2008 @@ -205,6 +205,18 @@ list<map> itemList = repo_mode ? sourceStatesOut : serviceStatesOut; + // displaye only repositories from the selected service + if (repo_mode && service_name != "") + { + itemList = filter(map repo, itemList, + { + return repo["service"]:"" == service_name; + } + ); + + y2internal("table items: %1", itemList); + } + integer numItems = size(itemList); integer i = 0; @@ -296,10 +308,37 @@ } } + void clearRepoInfo() + { + if (textmode()) + { + UI::ChangeWidget(`id(`name), `Label, ""); + UI::ChangeWidget(`id(`url), `Label, ""); + UI::ChangeWidget(`id(`category), `Label, ""); + UI::ChangeWidget(`id(`service), `Label, ""); + } + else + { + UI::ChangeWidget(`id(`repo_info), `Value, ""); + } + + UI::ChangeWidget (`id (`enable), `Value, false); + UI::ChangeWidget (`id (`autorefresh), `Value, false); + + if (UI::WidgetExists(`id(`priority))) + { + // priority is displayed only for repositories + UI::ChangeWidget (`id (`priority), `Value, default_priority); + } + } + void fillCurrentRepoInfo () { integer selected = (integer)UI::QueryWidget (`id (`table), `CurrentItem); if (selected == nil) + { + clearRepoInfo(); return; + } map data = (repository_view) ? sourceStatesOut[selected]:$[] : serviceStatesOut[selected]:$[]; @@ -334,6 +373,25 @@ return ret; } + list<string> newServices (list<map<string,any> > statesOld, + list<map<string,any> > statesNew) { + y2milestone ("Services from %1 To %2", statesOld, statesNew); + list<string> ret = []; + + map<string, boolean> seen = listmap ( + map<string, any> srv, statesOld, + ``( $[(srv["alias"]:"") : (srv["enabled"]:true) ] )); + + foreach (map<string, any> srv, statesNew, { + string alias = srv["alias"]:""; + boolean newena = srv["enabled"]:true; + if (newena && ! seen[alias]:false) + ret = add (ret, alias); + }); + y2milestone ("Difference %1", ret); + return ret; + } + define void deleteSource( integer index ) ``{ integer srcid = sourceStatesOut[index, "SrcId"]:-1; @@ -398,11 +456,22 @@ } ); + // evaluate removed services +/* + foreach(integer id, servicesToDelete, + { + success = success && Pkg::ServiceDelete(id); + } + ); +*/ + success = success && KeyManager::Write(); // store in the persistent libzypp storage success = success && Pkg::SourceSaveAll(); // #176013 + success = success && Pkg::ServicesSave(); + return success; } @@ -716,66 +785,214 @@ // start the GPG key manager //RunGPGKeyMgmt(); } + else if (input == `tree) + { + // handle tree events here... + any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); + + // rebuild the dialog if needed + y2internal("Current tree item: %1", current_item); + boolean update_table_widget = false; + + if (current_item == `repositories) + { + update_table_widget = !repository_view || displayed_service != ""; + y2milestone("Switching to repository view"); + repository_view = true; + displayed_service = ""; + } + else if (current_item == `services) + { + update_table_widget = repository_view; + y2milestone("Switching to service view"); + repository_view = false; + // display all services + displayed_service = ""; + } + else if (is(current_item, string)) + { + // switch to the selected repository + y2milestone("Switching to service %1", current_item); + repository_view = true; + // display the selected service + displayed_service = (string)current_item; + + // FIXME: always update the table? + update_table_widget = true; + } + + // update table widget + if (update_table_widget) + { + ReplaceWidgets(repository_view); + } + + // update table content + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + + // update the current item + current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); + y2internal("UI refresh done"); + } else { current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); y2debug( "Current item: %1", current ); - map<string, any> sourceState = sourceStatesOut[ current ]:$[]; + map<string, any> sourceState = $[]; + + if (repository_view) + { + if (displayed_service == "") + { + sourceState = sourceStatesOut[ current ]:$[]; + } + else + { + if (current != nil) + { + list<map<string,any> > sources_from_service = sourceStatesOut; + + sources_from_service = filter(map<string,any> src, sources_from_service, + { + return src["service"]:"" == displayed_service; + } + ); + + sourceState = sources_from_service[current]:$[]; + } + } + } + integer id = sourceState[ "SrcId" ]:-1; - if ( id < 0 && repository_view) { + if ( id < 0 && repository_view && displayed_service == "") { y2internal("Unable to determine repository id, broken repository?"); continue; } if ( input == `replace ) { - 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; + if (repository_view) + { + 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"]:""); + SourceDialogs::SetRepoName (sourceState["name"]:""); - do { - url = SourceDialogs::EditPopupType(url, plaindir); + do { + url = SourceDialogs::EditPopupType(url, plaindir); - if ( size( url ) == 0 ) break; - if (url != old_url || plaindir != SourceDialogs::IsPlainDir()) - { - y2milestone ("URL or plaindir flag changed, recreating the source"); - // copy the refresh flag - createResult = createSource( url, SourceDialogs::IsPlainDir(), sourceState["do_refresh"]:false, SourceDialogs::GetRepoName ()); - if ( createResult == `ok ) { - deleteSource( current ); - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - } - } - else - { - y2milestone ("URL is the same, not recreating the source"); - sourceState["name"] = SourceDialogs::GetRepoName (); - sourceStatesOut[ current ] = sourceState; - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - createResult = `ok; - } + if ( size( url ) == 0 ) break; + if (url != old_url || plaindir != SourceDialogs::IsPlainDir()) + { + y2milestone ("URL or plaindir flag changed, recreating the source"); + // copy the refresh flag + createResult = createSource( url, SourceDialogs::IsPlainDir(), sourceState["do_refresh"]:false, SourceDialogs::GetRepoName ()); + if ( createResult == `ok ) { + deleteSource( current ); + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + } + } + else + { + y2milestone ("URL is the same, not recreating the source"); + sourceState["name"] = SourceDialogs::GetRepoName (); + sourceStatesOut[ current ] = sourceState; + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + createResult = `ok; + } + + } while ( createResult == `again ); + } + else // service view + { + map <string, any> service_info = serviceStatesOut[current]:$[]; + y2milestone("Editing service %1...", current); + string url = service_info["url"]:""; + string old_url = url; + + SourceDialogs::SetRepoName(service_info["name"]:""); + do { + url = SourceDialogs::EditPopupType(url, false); + + if ( size( url ) == 0 ) break; + if (url != old_url) + { + y2milestone ("URL of the service has been changed, recreating the service"); + // createSource() can potentially create a repository instead of a service + // Probe for a service first must be done before creating a new service + string service_type = Pkg::ServiceProbe(url); + y2milestone("Probed service type: %1", service_type); + + if (service_type != nil && service_type != "NONE") + { + createResult = createSource(url, false /*plaindir*/, false /*do_refresh*/, SourceDialogs::GetRepoName()); + if ( createResult == `ok ) + { + deleteService( current ); + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); + } + } + else + { + Report::Error(sformat(_("There is no service at URL: +%1"), url)); + } + } + else + { + y2milestone ("URL is the same, not recreating the service"); + string entered_service_name = SourceDialogs::GetRepoName(); - } while ( createResult == `again ); + if (service_info["name"]:nil != entered_service_name) + { + y2milestone("Updating name of the service to '%1'", entered_service_name); + service_info["name"] = entered_service_name; + serviceStatesOut[ current ] = service_info; + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + createResult = `ok; + + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); + } + } + + } while ( createResult == `again ); + } } else if ( input == `refresh ) { - Pkg::SourceRefreshNow (id); + if (repository_view) + { + Pkg::SourceRefreshNow (id); - if (full_mode && sourceState["enabled"]:false) + if (full_mode && sourceState["enabled"]:false) + { + // force loading of the resolvables + Pkg::SourceSetEnabled(id, false); + Pkg::SourceSetEnabled(id, true); + } + } + else { - // force loading of the resolvables - Pkg::SourceSetEnabled(id, false); - Pkg::SourceSetEnabled(id, true); + // refresh a service + string service_name = (serviceStatesOut[current]:$[])["name"]:""; + + y2milestone("Refreshing service %1...", service_name); + Pkg::ServiceRefresh(service_name); } } else if ( input == `autorefresh_all || input == `refresh_enabled) @@ -863,7 +1080,7 @@ else { // yes-no popup - if ( Popup::YesNo( _("Delete the selected service from the list?") ) ) + if ( Popup::YesNo(sformat(_("Delete service %1?"), (serviceStatesOut[current]:$[])["name"]:""))) { deleteService( current ); fillTable(repository_view, displayed_service); @@ -975,43 +1192,6 @@ // do not refresh the item in the table current = -1; } - else if (input == `tree) - { - // handle tree events here... - any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); - - // rebuild the dialog if needed - y2internal("Current tree item: %1", current_item); - boolean update_table_widget = false; - - if (current_item == `repositories) - { - update_table_widget = !repository_view; - y2milestone("Switching to repository view"); - repository_view = true; - } - else if (current_item == `services) - { - update_table_widget = repository_view; - y2milestone("Switching to service view"); - repository_view = false; - // display all services - displayed_service = ""; - } - - // update table widget - if (update_table_widget) - { - ReplaceWidgets(repository_view); - } - - // update table content - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - - // update the current item - current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); - } else { y2warning("Unknown user input: %1", input); Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Wed Oct 1 13:35:24 2008 @@ -64,6 +64,29 @@ PackageSystem::CheckAndInstallPackages(["cifs-mount"]); } + string service_type = Pkg::ServiceProbe(url); + y2milestone("Probed service type: %1", service_type); + + if (service_type != nil && service_type != "NONE") + { + y2milestone("Adding a service of type %1...", service_type); + string alias = "service"; + // all current aliases + list<string> aliases = Pkg::ServiceAliases(); + + // service alias must be unique + // if it already exists add "_<number>" suffix to it + integer idx = 1; + while (contains(aliases, alias)) + { + alias = sformat("service_%1", idx); + idx = idx + 1; + } + + Pkg::ServiceAdd(alias, url); + return `ok; + } + list<list<string> > new_repos = Pkg::RepositoryScan(url); y2milestone("new_repos: %1", new_repos); -- 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] r51730 - /trunk/packager/src/modules/SourceDialogs.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:27:28 2008 New Revision: 51730 URL: http://svn.opensuse.org/viewcvs/yast?rev=51730&view=rev Log: fixed typo (InputFiled ->InputField) Modified: trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Wed Oct 1 13:27:28 2008 @@ -1302,7 +1302,7 @@ // text entry `InputField (`id (`server), `opt (`hstretch), _("Server &Name"), server), (type == `http || type == `https) ? - `HSquash(`InputFiled (`id (`port), _("&Port"), port)) + `HSquash(`InputField (`id (`port), _("&Port"), port)) : `Empty() ), type == `samba -- 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] r51729 - /tags/stable-2_17_0/wagon/
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:24:19 2008 New Revision: 51729 URL: http://svn.opensuse.org/viewcvs/yast?rev=51729&view=rev Log: Created tag stable-2_17_0 for wagon Added: tags/stable-2_17_0/wagon/ - copied from r51728, trunk/wagon/ -- 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] r51728 - /trunk/wagon/package/yast2-wagon.changes
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:24:10 2008 New Revision: 51728 URL: http://svn.opensuse.org/viewcvs/yast?rev=51728&view=rev Log: New (the very first ever) version Modified: trunk/wagon/package/yast2-wagon.changes Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 1 13:24:10 2008 @@ -2,6 +2,7 @@ Mon Sep 29 12:44:37 CEST 2008 - locilka(a)suse.cz - Added possibility to restart YaST on request. +- 2.17.0 ------------------------------------------------------------------- Thu Sep 25 15:28:49 2008 - locilka(a)suse.cz -- 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] r51727 - in /trunk/audit-laf/src: audit-laf.ycp dialogs.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:14:14 2008 New Revision: 51727 URL: http://svn.opensuse.org/viewcvs/yast?rev=51727&view=rev Log: make command line work (remove UI:GetDisplayInfo which would initialise UI) Modified: trunk/audit-laf/src/audit-laf.ycp trunk/audit-laf/src/dialogs.ycp Modified: trunk/audit-laf/src/audit-laf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/audit-laf.ycp?rev=… ============================================================================== --- trunk/audit-laf/src/audit-laf.ycp (original) +++ trunk/audit-laf/src/audit-laf.ycp Wed Oct 1 13:14:14 2008 @@ -51,7 +51,7 @@ map cmdline_description = $[ "id" : "audit-laf", /* Command line help text for the Xaudit-laf module */ - "help" : _("Configuration of audit-laf"), + "help" : _("Configuration of Linux Audit Framework (LAF)"), "guihandler" : AuditLafSequence, "initialize" : AuditLaf::Read, "finish" : AuditLaf::Write, Modified: trunk/audit-laf/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/dialogs.ycp?rev=51… ============================================================================== --- trunk/audit-laf/src/dialogs.ycp (original) +++ trunk/audit-laf/src/dialogs.ycp Wed Oct 1 13:14:14 2008 @@ -36,17 +36,9 @@ include "audit-laf/helps.ycp"; -map current_ui_settings = UI::GetDisplayInfo(); - integer mbox_x = 1; integer mbox_y = 0.5; -// Tabs have a different layout in textmode -if (current_ui_settings["TextMode"]:false == true) { - mbox_x = 0; - mbox_y = 0; -} - term LogfileSettingsDialogContent () { return `MarginBox( mbox_x, mbox_y, `VBox( -- 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] r51726 - /trunk/audit-laf/src/complex.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:12:06 2008 New Revision: 51726 URL: http://svn.opensuse.org/viewcvs/yast?rev=51726&view=rev Log: remove superfluous sformat Modified: trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=51… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Wed Oct 1 13:12:06 2008 @@ -363,7 +363,7 @@ map output = (map)SCR::Execute(.target.bash_output, sformat( "auditctl -R %1", tmpfile ) ); if ( output["exit"]:0 != 0 ) { - Report::Error( sformat( output["stderr"]:"" ) ); + Report::Error( output["stderr"]:"" ); } else { @@ -416,8 +416,7 @@ This means the rules are locked until next boot! If you really want this, make sure '-e 2' is the last entry in the rules file. If not, either enable or disable auditing. -To check or to change the rules, -please go back to rules editor."), +To check or to change the rules, please go back to rules editor."), Label::ContinueButton(), Label::BackButton(), `focus_no ); -- 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] r51725 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/ServiceManager.cc src/ServiceManager.h
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 13:08:40 2008 New Revision: 51725 URL: http://svn.opensuse.org/viewcvs/yast?rev=51725&view=rev Log: - fixed Pkg::ServiceRefresh() - search for the service URL and pass it to libzypp Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/ServiceManager.cc trunk/pkg-bindings/src/ServiceManager.h Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Wed Oct 1 13:08:40 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 13:02:00 CEST 2008 - lslezak(a)suse.cz + +- fixed Pkg::ServiceRefresh() - search for the service URL and pass + it to libzypp + +------------------------------------------------------------------- Mon Sep 29 14:27:21 CEST 2008 - lslezak(a)suse.cz - do not autorefresh remote repositories when there is no network Modified: trunk/pkg-bindings/src/ServiceManager.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ServiceManager.… ============================================================================== --- trunk/pkg-bindings/src/ServiceManager.cc (original) +++ trunk/pkg-bindings/src/ServiceManager.cc Wed Oct 1 13:08:40 2008 @@ -114,11 +114,19 @@ return ret; } -bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) const +bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) { try { - repomgr.refreshService(alias); + PkgServices::iterator serv_it = _known_services.find(alias); + + if (serv_it == _known_services.end()) + { + y2error("Service '%s' does not exist", alias.c_str()); + return false; + } + + repomgr.refreshService(serv_it->second); return true; } catch(...) Modified: trunk/pkg-bindings/src/ServiceManager.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ServiceManager.… ============================================================================== --- trunk/pkg-bindings/src/ServiceManager.h (original) +++ trunk/pkg-bindings/src/ServiceManager.h Wed Oct 1 13:08:40 2008 @@ -52,7 +52,7 @@ bool SetService(const std::string old_alias, const zypp::ServiceInfo &srv); - bool RefreshService(const std::string &alias, zypp::RepoManager &repomgr) const; + bool RefreshService(const std::string &alias, zypp::RepoManager &repomgr); std::string Probe(const zypp::Url &url, const zypp::RepoManager &repomgr) const; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0