January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60553 - /tags/branch-Code-11-SP1-2_17_118/
by kmachalkova＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: kmachalkova Date: Wed Jan 27 15:12:45 2010 New Revision: 60553 URL: http://svn.opensuse.org/viewcvs/yast?rev=60553&view=rev Log: Created tag branch-Code-11-SP1-2_17_118 Added: tags/branch-Code-11-SP1-2_17_118/ -- 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] r60552 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/lan/help.ycp
by kmachalkova＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: kmachalkova Date: Wed Jan 27 14:38:30 2010 New Revision: 60552 URL: http://svn.opensuse.org/viewcvs/yast?rev=60552&view=rev Log: changes + bump Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Wed Jan 27 14:38:30 2010 @@ -1 +1 @@ -2.17.117 +2.17.118 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Wed Jan 27 14:38:30 2010 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue Jan 26 12:54:44 CET 2010 - kmachalkova(a)suse.cz + +- Evaluate modified flag of all net components (not only LanItems), + so that change in any of them triggers Write (bnc#439235) +- Write DNS data along with other network settings in lan_proposal, + not separately in inst_hostname (related to bnc#556613) +- Renamed "Write hostname to /etc/hosts" and updated related help + text (bnc#510228, bnc#469752) +- 2.17.118 + +------------------------------------------------------------------- Mon Jan 18 09:56:54 CET 2010 - mzugec(a)suse.cz - fixed remote.desktop file (Categories) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp Wed Jan 27 14:38:30 2010 @@ -98,7 +98,7 @@ <tt>127.0.0.2</tt> (loopback) IP address in <tt>/etc/hosts</tt>. This is an useful option if you want to have the hostname resolvable at all times, even without active network. In all other cases, use it carefully, especially -if this computer runs some network services.</p>"), +if this computer provides some network services.</p>"), "searchlist_s": _("<p>Enter the name servers and domain search list for resolving -- 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] r60551 - /tags/branch-Code-11-2_17_8_2/wagon/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 14:21:56 2010 New Revision: 60551 URL: http://svn.opensuse.org/viewcvs/yast?rev=60551&view=rev Log: Created tag branch-Code-11-2_17_8_2 for wagon Added: tags/branch-Code-11-2_17_8_2/wagon/ - copied from r60550, branches/SuSE-Code-11-Branch/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] r60550 - /tags/branch-Code-11-2_17_8_2/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 14:21:54 2010 New Revision: 60550 URL: http://svn.opensuse.org/viewcvs/yast?rev=60550&view=rev Log: Created tag branch-Code-11-2_17_8_2 Added: tags/branch-Code-11-2_17_8_2/ -- 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] r60549 - /tags/branch-Code-11-SP1-2_17_11/wagon/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 14:19:35 2010 New Revision: 60549 URL: http://svn.opensuse.org/viewcvs/yast?rev=60549&view=rev Log: Created tag branch-Code-11-SP1-2_17_11 for wagon Added: tags/branch-Code-11-SP1-2_17_11/wagon/ (props changed) - copied from r60548, branches/SuSE-Code-11-SP1-Branch/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] r60548 - /trunk/mail/src/Mail.ycp
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 12:51:43 2010 New Revision: 60548 URL: http://svn.opensuse.org/viewcvs/yast?rev=60548&view=rev Log: Apply jsuchomes changes from bnc#559145 Export and Import smtp_use_TLS Modified: trunk/mail/src/Mail.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=60548&r1=6… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Wed Jan 27 12:51:43 2010 @@ -630,6 +630,14 @@ } /** + * Wrapper for global Read function, without the callback argument + */ + global boolean ReadWithoutCallback () { + block<boolean> abort_block = ``{ return false; }; + return Read (abort_block); + } + + /** * Make up data for screnshots */ global define void Fake () ``{ @@ -676,7 +684,7 @@ * Part of Write. * @return success */ - define boolean WriteGeneral () ``{ + global define boolean WriteGeneral () ``{ // create_config // if the user wanted it false, we did not proceed SCR::Write (.sysconfig.mail.MAIL_CREATE_CONFIG, "yes"); @@ -811,7 +819,7 @@ * Part of Write. * @return success */ - define boolean WriteMasquerading () ``{ + global define boolean WriteMasquerading () ``{ // from_header SCR::Write (.sysconfig.mail.FROM_HEADER, from_header); // masquerade_other_domains @@ -857,7 +865,7 @@ * Part of Write. * @return success */ - define boolean WriteDownloading () ``{ + global define boolean WriteDownloading () ``{ // fetchmail // TODO ?other settings: autofetch? at device up? SCR::Write (.mail.fetchmail.accounts, fetchmail); @@ -883,7 +891,7 @@ * Part of Write. * @return success */ - define boolean WriteAliasesAndVirtual () ``{ + global define boolean WriteAliasesAndVirtual () ``{ // aliases if (! MailAliases::WriteAliases ()) { @@ -916,7 +924,7 @@ * Part of Write. * @return success */ - define boolean WriteSmtpAuth () ``{ + global define boolean WriteSmtpAuth () ``{ // TODO how to remove the only entry? // filter it out in the dialog? if (enable_smtp_auth != nil) @@ -950,7 +958,7 @@ * Part of Write. * @return success */ - define boolean WriteFlush () ``{ + global define boolean WriteFlush () ``{ //flush the agents map<string, path> paths = $[ "/etc/sysconfig/mail": .sysconfig.mail, @@ -1008,7 +1016,7 @@ * Part of Write. * @return success */ - define boolean WriteSuSEconfig () ``{ + global define boolean WriteSuSEconfig () ``{ //run SuSEconfig with the necessary modules // TODO other modules using FROM_HEADER? integer ret = 0; @@ -1040,7 +1048,7 @@ * Part of Write. * @return success */ - define boolean WriteServices () ``{ + global define boolean WriteServices () ``{ if (amavis_service) { Service::Stop ("amavis"); @@ -1161,6 +1169,13 @@ return true; } + /** + * Wrapper for global Write function, without the callback argument + */ + global boolean WriteWithoutCallback () { + block<boolean> abort_block = ``{ return false; }; + return Write (abort_block); + } /** * Get all mail settings from the first parameter @@ -1218,6 +1233,7 @@ MailAliases::FilterRootAlias (); // MailAliases::merge_aliases = settings["merge_aliases"]: false; virtual_users = settings["virtual_users"]: []; + smtp_use_TLS = settings["smtp_use_TLS"]: "yes"; smtp_auth = settings["smtp_auth"]: []; y2debug ("after %1", settings); // may contain passwords return true; @@ -1245,6 +1261,7 @@ // "merge_aliases": MailAliases::merge_aliases, "virtual_users": virtual_users, "smtp_auth": smtp_auth, + "smtp_use_TLS": smtp_use_TLS, ]; if (mta == `postfix) { -- 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] r60547 - in /trunk/mail/src: Mail.ycp ui.ycp
by varkoly＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: varkoly Date: Wed Jan 27 12:44:45 2010 New Revision: 60547 URL: http://svn.opensuse.org/viewcvs/yast?rev=60547&view=rev Log: Make smtp_use_TLS ternary Modified: trunk/mail/src/Mail.ycp trunk/mail/src/ui.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=60547&r1=6… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Wed Jan 27 12:44:45 2010 @@ -103,7 +103,7 @@ /** * Do the MTA use TLS for sending the email. */ - global boolean smtp_use_TLS = true; + global string smtp_use_TLS = "yes"; /** * Mail will appear to come from this domain. Applies also for the @@ -447,7 +447,7 @@ } else if (mta == `postfix) { - smtp_use_TLS = ( (string) SCR::Read (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT) == "yes" ); + smtp_use_TLS = (string) SCR::Read (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT); outgoing_mail_server = (string) SCR::Read (.sysconfig.postfix.POSTFIX_RELAYHOST); } @@ -783,14 +783,7 @@ else if (mta == `postfix) { SCR::Write (.sysconfig.postfix.POSTFIX_RELAYHOST, outgoing_mail_server); - if( smtp_use_TLS ) - { - SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, "yes"); - } - else - { - SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, "no"); - } + SCR::Write (.sysconfig.postfix.POSTFIX_SMTP_TLS_CLIENT, smtp_use_TLS); } else { Modified: trunk/mail/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/ui.ycp?rev=60547&r1=605… ============================================================================== --- trunk/mail/src/ui.ycp (original) +++ trunk/mail/src/ui.ycp Wed Jan 27 12:44:45 2010 @@ -342,6 +342,10 @@ define symbol OutgoingDialog () ``{ Wizard::SetScreenShotName ("mail-21-outgoing"); + boolean TLSnone = ( Mail::smtp_use_TLS == "no" ); + boolean TLSuse = ( Mail::smtp_use_TLS == "yes" ); + boolean TLSmust = ( Mail::smtp_use_TLS == "must" ); + // what buttons can be used to leave this dialog //(except the std wizarding ones) list<symbol> buttons = []; @@ -357,7 +361,13 @@ `VBox ( WJ_MakeWidget (`outgoing_mail_server), // TLS - `CheckBox( `id(`tls), _("The server use &TLS"), Mail::smtp_use_TLS ), + `RadioButtonGroup(`id(`TLS), _("The server use &TLS") + `HBox( + `Left(`RadioButton(`id("no"), _("No"), TLSnone)), + `Left(`RadioButton(`id("yes"), _("Use"), TLSuse)), + `Left(`RadioButton(`id("must"), _("Enforce"),TLSmust)) + ) + ), // Translators: button // TODO ... `PushButton (`id(`outgoing_details), _("&Masquerading")), -- 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] Build failed in Hudson: webyast-service-11.1-i586 #727
by Hudson Integration Service 27 Jan '10

27 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-11.1-i586/727/changes> Changes: [Stefan Schubert] cleanup of the log model/module [Stefan Schubert] Merge branch 'master' of git@gitorious.org:opensuse/yast-rest-service ------------------------------------------ [...truncated 2981 lines...] mkdir -p package/www/. rm -f package/www/./.gitignore ln ./.gitignore package/www/./.gitignore rm -f package/www/./COPYING ln ./COPYING package/www/./COPYING rm -f package/www/./README ln ./README package/www/./README rm -f package/www/./Rakefile ln ./Rakefile package/www/./Rakefile mkdir -p package/www/./app/controllers rm -f package/www/./app/controllers/ntp_controller.rb ln ./app/controllers/ntp_controller.rb package/www/./app/controllers/ntp_controller.rb mkdir -p package/www/./app/models rm -f package/www/./app/models/ntp.rb ln ./app/models/ntp.rb package/www/./app/models/ntp.rb mkdir -p package/www/./config rm -f package/www/./config/rails_parent.rb ln ./config/rails_parent.rb package/www/./config/rails_parent.rb mkdir -p package/www/./config/resources rm -f package/www/./config/resources/ntp.yml ln ./config/resources/ntp.yml package/www/./config/resources/ntp.yml mkdir -p package/www/./doc rm -f package/www/./doc/README_FOR_APP ln ./doc/README_FOR_APP package/www/./doc/README_FOR_APP rm -f package/www/./init.rb ln ./init.rb package/www/./init.rb rm -f package/www/./install.rb ln ./install.rb package/www/./install.rb mkdir -p package/www/./restdoc rm -f package/www/./restdoc/api.txt ln ./restdoc/api.txt package/www/./restdoc/api.txt rm -f package/www/./restdoc/ntp.xml ln ./restdoc/ntp.xml package/www/./restdoc/ntp.xml rm -f package/www/./restdoc/sync_request.xml ln ./restdoc/sync_request.xml package/www/./restdoc/sync_request.xml rm -f package/www/./uninstall.rb ln ./uninstall.rb package/www/./uninstall.rb cd package tar jcvf www.tar.bz2 www (in /src/rest-service/plugins/ntp) www/ www/README www/config/ www/config/rails_parent.rb www/config/resources/ www/config/resources/ntp.yml www/.gitignore www/app/ www/app/models/ www/app/models/ntp.rb www/app/controllers/ www/app/controllers/ntp_controller.rb www/COPYING www/install.rb www/doc/ www/doc/README_FOR_APP www/Rakefile www/init.rb www/uninstall.rb www/restdoc/ www/restdoc/ntp.xml www/restdoc/api.txt www/restdoc/sync_request.xml cd - WARNING: Ignoring file: config/status_configuration.yaml mkdir -p package mkdir -p package/www/. rm -f package/www/./.gitignore ln ./.gitignore package/www/./.gitignore rm -f package/www/./COPYING ln ./COPYING package/www/./COPYING rm -f package/www/./README ln ./README package/www/./README rm -f package/www/./Rakefile ln ./Rakefile package/www/./Rakefile mkdir -p package/www/./app/controllers rm -f package/www/./app/controllers/graphs_controller.rb ln ./app/controllers/graphs_controller.rb package/www/./app/controllers/graphs_controller.rb rm -f package/www/./app/controllers/logs_controller.rb ln ./app/controllers/logs_controller.rb package/www/./app/controllers/logs_controller.rb rm -f package/www/./app/controllers/metrics_controller.rb ln ./app/controllers/metrics_controller.rb package/www/./app/controllers/metrics_controller.rb mkdir -p package/www/./app/models rm -f package/www/./app/models/graph.rb ln ./app/models/graph.rb package/www/./app/models/graph.rb rm -f package/www/./app/models/log.rb ln ./app/models/log.rb package/www/./app/models/log.rb rm -f package/www/./app/models/metric.rb ln ./app/models/metric.rb package/www/./app/models/metric.rb mkdir -p package/www/./app/views/graphs rm -f package/www/./app/views/graphs/show.html.erb ln ./app/views/graphs/show.html.erb package/www/./app/views/graphs/show.html.erb rm -f package/www/./app/views/graphs/show.xml.erb ln ./app/views/graphs/show.xml.erb package/www/./app/views/graphs/show.xml.erb mkdir -p package/www/./app/views/logs rm -f package/www/./app/views/logs/show.html.erb ln ./app/views/logs/show.html.erb package/www/./app/views/logs/show.html.erb rm -f package/www/./app/views/logs/show.xml.erb ln ./app/views/logs/show.xml.erb package/www/./app/views/logs/show.xml.erb mkdir -p package/www/./app/views/metrics rm -f package/www/./app/views/metrics/show.html.erb ln ./app/views/metrics/show.html.erb package/www/./app/views/metrics/show.html.erb rm -f package/www/./app/views/metrics/show.xml.erb ln ./app/views/metrics/show.xml.erb package/www/./app/views/metrics/show.xml.erb mkdir -p package/www/./config rm -f package/www/./config/rails_parent.rb ln ./config/rails_parent.rb package/www/./config/rails_parent.rb mkdir -p package/www/./config/resources rm -f package/www/./config/resources/graphs.yml ln ./config/resources/graphs.yml package/www/./config/resources/graphs.yml rm -f package/www/./config/resources/logs.yml ln ./config/resources/logs.yml package/www/./config/resources/logs.yml rm -f package/www/./config/resources/metrics.yml ln ./config/resources/metrics.yml package/www/./config/resources/metrics.yml rm -f package/www/./config/resources/status.yml ln ./config/resources/status.yml package/www/./config/resources/status.yml mkdir -p package/www/./doc rm -f package/www/./doc/README_FOR_APP ln ./doc/README_FOR_APP package/www/./doc/README_FOR_APP rm -f package/www/./doc/logs.yml ln ./doc/logs.yml package/www/./doc/logs.yml mkdir -p package/www/./restdoc rm -f package/www/./restdoc/api.txt ln ./restdoc/api.txt package/www/./restdoc/api.txt rm -f package/www/./restdoc/graphs.xml ln ./restdoc/graphs.xml package/www/./restdoc/graphs.xml rm -f package/www/./restdoc/memory.xml ln ./restdoc/memory.xml package/www/./restdoc/memory.xml rm -f package/www/./restdoc/metrics.xml ln ./restdoc/metrics.xml package/www/./restdoc/metrics.xml rm -f package/www/./restdoc/waerden+memory+memory-used.xml ln ./restdoc/waerden+memory+memory-used.xml package/www/./restdoc/waerden+memory+memory-used.xml mkdir -p package/www/./tasks rm -f package/www/./tasks/status_tasks.rake ln ./tasks/status_tasks.rake package/www/./tasks/status_tasks.rake cd package tar jcvf www.tar.bz2 www (in /src/rest-service/plugins/status) www/ www/README www/config/ www/config/rails_parent.rb www/config/resources/ www/config/resources/logs.yml www/config/resources/graphs.yml www/config/resources/metrics.yml www/config/resources/status.yml www/.gitignore www/app/ www/app/models/ www/app/models/metric.rb www/app/models/graph.rb www/app/models/log.rb www/app/controllers/ www/app/controllers/logs_controller.rb www/app/controllers/graphs_controller.rb www/app/controllers/metrics_controller.rb www/app/views/ www/app/views/logs/ www/app/views/logs/show.xml.erb www/app/views/logs/show.html.erb www/app/views/metrics/ www/app/views/metrics/show.xml.erb www/app/views/metrics/show.html.erb www/app/views/graphs/ www/app/views/graphs/show.xml.erb www/app/views/graphs/show.html.erb www/COPYING www/tasks/ www/tasks/status_tasks.rake www/doc/ www/doc/logs.yml www/doc/README_FOR_APP www/Rakefile www/restdoc/ www/restdoc/memory.xml www/restdoc/waerden+memory+memory-used.xml www/restdoc/metrics.xml www/restdoc/graphs.xml www/restdoc/api.txt cd - WARNING: Ignoring file: config/status_configuration.yaml ++ find ./plugins -name package ++ grep -v 'rpam\|ruby-polkit' + for rpmdir in '${SUBDIR}/package' '`find ./plugins -name package | grep -v "rpam\|ruby-polkit"`' ++ dirname webservice/package + pkgdir=webservice ++ basename webservice + pkgname=webservice + destination=/artifacts/webyast/rest-service/package/yast2-webservice-webservice + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-webservice + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-webservice/*' + rm -rf webservice/package/www + cp -r webservice/package/cleanurl-v5.lua webservice/package/grantwebyastrights webservice/package/lighttpd.conf webservice/package/modules.conf webservice/package/org.opensuse.yast.permissions.policy webservice/package/rails.include webservice/package/webyast webservice/package/yast.conf webservice/package/yast2-webservice.changes webservice/package/yast2-webservice.spec webservice/package/yast_user_roles webservice/package/yastws /artifacts/webyast/rest-service/package/yast2-webservice-webservice + pushd webservice/package /src/rest-service/webservice/package /src/rest-service + case "${pkgdir}" in + build_install_spec + build_spec + rpm --rebuilddb + mkdir -p /tmp + mkdir -p /artifacts/webyast/rest-service/rpms + mkdir -p /tmp/rpmbuild + mkdir -p /tmp/buildroot + cat + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' yast2-webservice.spec error: File /src/rest-service/webservice/package/www.tar.bz2: No such file or directory + check_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + footer_and_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + ascii_failed + cat ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed + echo 'stopping dbus..' stopping dbus.. + /etc/init.d/dbus stop Shutting down D-Bus daemon..done + exit 1 ... unmounting sys ... unmounting proc ... unmounting pts [locks-and-latches] Releasing all the locks [locks-and-latches] All the locks released Archiving artifacts Build wasn't successful, skipping saikuro coverage report Publishing rails stats report... [workspace] $ rake --silent stats Failed to send e-mail to Stefan Schubert because no e-mail address is known, and no default e-mail domain is configured -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1

[yast-commit] Build failed in Hudson: webyast-service-head-i586 #680
by Hudson Integration Service 27 Jan '10

27 Jan '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/680/changes> Changes: [Stefan Schubert] cleanup of the log model/module [Stefan Schubert] Merge branch 'master' of git@gitorious.org:opensuse/yast-rest-service ------------------------------------------ [...truncated 3081 lines...] mkdir -p package/www/. rm -f package/www/./.gitignore ln ./.gitignore package/www/./.gitignore rm -f package/www/./COPYING ln ./COPYING package/www/./COPYING rm -f package/www/./README ln ./README package/www/./README rm -f package/www/./Rakefile ln ./Rakefile package/www/./Rakefile mkdir -p package/www/./app/controllers rm -f package/www/./app/controllers/ntp_controller.rb ln ./app/controllers/ntp_controller.rb package/www/./app/controllers/ntp_controller.rb mkdir -p package/www/./app/models rm -f package/www/./app/models/ntp.rb ln ./app/models/ntp.rb package/www/./app/models/ntp.rb mkdir -p package/www/./config rm -f package/www/./config/rails_parent.rb ln ./config/rails_parent.rb package/www/./config/rails_parent.rb mkdir -p package/www/./config/resources rm -f package/www/./config/resources/ntp.yml ln ./config/resources/ntp.yml package/www/./config/resources/ntp.yml mkdir -p package/www/./doc rm -f package/www/./doc/README_FOR_APP ln ./doc/README_FOR_APP package/www/./doc/README_FOR_APP rm -f package/www/./init.rb ln ./init.rb package/www/./init.rb rm -f package/www/./install.rb ln ./install.rb package/www/./install.rb mkdir -p package/www/./restdoc rm -f package/www/./restdoc/api.txt ln ./restdoc/api.txt package/www/./restdoc/api.txt rm -f package/www/./restdoc/ntp.xml ln ./restdoc/ntp.xml package/www/./restdoc/ntp.xml rm -f package/www/./restdoc/sync_request.xml ln ./restdoc/sync_request.xml package/www/./restdoc/sync_request.xml rm -f package/www/./uninstall.rb ln ./uninstall.rb package/www/./uninstall.rb cd package tar jcvf www.tar.bz2 www (in /src/rest-service/plugins/ntp) www/ www/README www/config/ www/config/rails_parent.rb www/config/resources/ www/config/resources/ntp.yml www/.gitignore www/app/ www/app/models/ www/app/models/ntp.rb www/app/controllers/ www/app/controllers/ntp_controller.rb www/COPYING www/install.rb www/doc/ www/doc/README_FOR_APP www/Rakefile www/init.rb www/uninstall.rb www/restdoc/ www/restdoc/ntp.xml www/restdoc/api.txt www/restdoc/sync_request.xml cd - WARNING: Ignoring file: config/status_configuration.yaml mkdir -p package mkdir -p package/www/. rm -f package/www/./.gitignore ln ./.gitignore package/www/./.gitignore rm -f package/www/./COPYING ln ./COPYING package/www/./COPYING rm -f package/www/./README ln ./README package/www/./README rm -f package/www/./Rakefile ln ./Rakefile package/www/./Rakefile mkdir -p package/www/./app/controllers rm -f package/www/./app/controllers/graphs_controller.rb ln ./app/controllers/graphs_controller.rb package/www/./app/controllers/graphs_controller.rb rm -f package/www/./app/controllers/logs_controller.rb ln ./app/controllers/logs_controller.rb package/www/./app/controllers/logs_controller.rb rm -f package/www/./app/controllers/metrics_controller.rb ln ./app/controllers/metrics_controller.rb package/www/./app/controllers/metrics_controller.rb mkdir -p package/www/./app/models rm -f package/www/./app/models/graph.rb ln ./app/models/graph.rb package/www/./app/models/graph.rb rm -f package/www/./app/models/log.rb ln ./app/models/log.rb package/www/./app/models/log.rb rm -f package/www/./app/models/metric.rb ln ./app/models/metric.rb package/www/./app/models/metric.rb mkdir -p package/www/./app/views/graphs rm -f package/www/./app/views/graphs/show.html.erb ln ./app/views/graphs/show.html.erb package/www/./app/views/graphs/show.html.erb rm -f package/www/./app/views/graphs/show.xml.erb ln ./app/views/graphs/show.xml.erb package/www/./app/views/graphs/show.xml.erb mkdir -p package/www/./app/views/logs rm -f package/www/./app/views/logs/show.html.erb ln ./app/views/logs/show.html.erb package/www/./app/views/logs/show.html.erb rm -f package/www/./app/views/logs/show.xml.erb ln ./app/views/logs/show.xml.erb package/www/./app/views/logs/show.xml.erb mkdir -p package/www/./app/views/metrics rm -f package/www/./app/views/metrics/show.html.erb ln ./app/views/metrics/show.html.erb package/www/./app/views/metrics/show.html.erb rm -f package/www/./app/views/metrics/show.xml.erb ln ./app/views/metrics/show.xml.erb package/www/./app/views/metrics/show.xml.erb mkdir -p package/www/./config rm -f package/www/./config/rails_parent.rb ln ./config/rails_parent.rb package/www/./config/rails_parent.rb mkdir -p package/www/./config/resources rm -f package/www/./config/resources/graphs.yml ln ./config/resources/graphs.yml package/www/./config/resources/graphs.yml rm -f package/www/./config/resources/logs.yml ln ./config/resources/logs.yml package/www/./config/resources/logs.yml rm -f package/www/./config/resources/metrics.yml ln ./config/resources/metrics.yml package/www/./config/resources/metrics.yml rm -f package/www/./config/resources/status.yml ln ./config/resources/status.yml package/www/./config/resources/status.yml mkdir -p package/www/./doc rm -f package/www/./doc/README_FOR_APP ln ./doc/README_FOR_APP package/www/./doc/README_FOR_APP rm -f package/www/./doc/logs.yml ln ./doc/logs.yml package/www/./doc/logs.yml mkdir -p package/www/./restdoc rm -f package/www/./restdoc/api.txt ln ./restdoc/api.txt package/www/./restdoc/api.txt rm -f package/www/./restdoc/graphs.xml ln ./restdoc/graphs.xml package/www/./restdoc/graphs.xml rm -f package/www/./restdoc/memory.xml ln ./restdoc/memory.xml package/www/./restdoc/memory.xml rm -f package/www/./restdoc/metrics.xml ln ./restdoc/metrics.xml package/www/./restdoc/metrics.xml rm -f package/www/./restdoc/waerden+memory+memory-used.xml ln ./restdoc/waerden+memory+memory-used.xml package/www/./restdoc/waerden+memory+memory-used.xml mkdir -p package/www/./tasks rm -f package/www/./tasks/status_tasks.rake ln ./tasks/status_tasks.rake package/www/./tasks/status_tasks.rake cd package tar jcvf www.tar.bz2 www (in /src/rest-service/plugins/status) www/ www/README www/config/ www/config/rails_parent.rb www/config/resources/ www/config/resources/logs.yml www/config/resources/graphs.yml www/config/resources/metrics.yml www/config/resources/status.yml www/.gitignore www/app/ www/app/models/ www/app/models/metric.rb www/app/models/graph.rb www/app/models/log.rb www/app/controllers/ www/app/controllers/logs_controller.rb www/app/controllers/graphs_controller.rb www/app/controllers/metrics_controller.rb www/app/views/ www/app/views/logs/ www/app/views/logs/show.xml.erb www/app/views/logs/show.html.erb www/app/views/metrics/ www/app/views/metrics/show.xml.erb www/app/views/metrics/show.html.erb www/app/views/graphs/ www/app/views/graphs/show.xml.erb www/app/views/graphs/show.html.erb www/COPYING www/tasks/ www/tasks/status_tasks.rake www/doc/ www/doc/logs.yml www/doc/README_FOR_APP www/Rakefile www/restdoc/ www/restdoc/memory.xml www/restdoc/waerden+memory+memory-used.xml www/restdoc/metrics.xml www/restdoc/graphs.xml www/restdoc/api.txt cd - WARNING: Ignoring file: config/status_configuration.yaml ++ find ./plugins -name package ++ grep -v 'rpam\|ruby-polkit' + for rpmdir in '${SUBDIR}/package' '`find ./plugins -name package | grep -v "rpam\|ruby-polkit"`' ++ dirname webservice/package + pkgdir=webservice ++ basename webservice + pkgname=webservice + destination=/artifacts/webyast/rest-service/package/yast2-webservice-webservice + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-webservice + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-webservice/*' + rm -rf webservice/package/www + cp -r webservice/package/cleanurl-v5.lua webservice/package/grantwebyastrights webservice/package/lighttpd.conf webservice/package/modules.conf webservice/package/org.opensuse.yast.permissions.policy webservice/package/rails.include webservice/package/webyast webservice/package/yast.conf webservice/package/yast2-webservice.changes webservice/package/yast2-webservice.spec webservice/package/yast_user_roles webservice/package/yastws /artifacts/webyast/rest-service/package/yast2-webservice-webservice + pushd webservice/package /src/rest-service/webservice/package /src/rest-service + case "${pkgdir}" in + build_install_spec + build_spec + rpm --rebuilddb + mkdir -p /tmp + mkdir -p /artifacts/webyast/rest-service/rpms + mkdir -p /tmp/rpmbuild + mkdir -p /tmp/buildroot + cat + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + /usr/bin/rpmbuild -bb --define 'run_testsuite 1' yast2-webservice.spec error: File /src/rest-service/webservice/package/www.tar.bz2: No such file or directory + check_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + footer_and_exit 1 + '[' -z 1 ']' + MYEXIT=1 + '[' 1 == 0 ']' + ascii_failed + cat ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed + echo 'stopping dbus..' stopping dbus.. + /etc/init.d/dbus stop Shutting down D-Bus daemon..done + exit 1 ... unmounting sys ... unmounting proc ... unmounting pts [locks-and-latches] Releasing all the locks [locks-and-latches] All the locks released Archiving artifacts Build wasn't successful, skipping saikuro coverage report Publishing rails stats report... [workspace] $ rake --silent stats Failed to send e-mail to Stefan Schubert because no e-mail address is known, and no default e-mail domain is configured -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1

[yast-commit] r60546 - in /branches/SuSE-Code-11-Branch/wagon: ./ package/ src/clients/ src/config/ src/include/ src/modules/
by locilka＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: locilka Date: Wed Jan 27 12:06:50 2010 New Revision: 60546 URL: http://svn.opensuse.org/viewcvs/yast?rev=60546&view=rev Log: - Disabling repositories that provide some old version of product to be upgraded (BNC #573092). - Fixed RPM dependencies. - 2.17.8.2 Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp Modified: branches/SuSE-Code-11-Branch/wagon/VERSION branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-Branch/wagon/VERSION Wed Jan 27 12:06:50 2010 @@ -1 +1 @@ -2.17.8.1 +2.17.8.2 Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Wed Jan 27 12:06:50 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz + +- Disabling repositories that provide some old version of product + to be upgraded (BNC #573092). +- Fixed RPM dependencies. +- 2.17.8.2 + +------------------------------------------------------------------- Tue Jan 26 15:13:12 CET 2010 - locilka(a)suse.cz - Added support for migration hook scripts. Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp Wed Jan 27 12:06:50 2010 @@ -206,6 +206,24 @@ false, true ); + y2milestone ("Repositories disabled by migration: %1", Wagon::disabled_repositories); + foreach (string repo_alias, Wagon::disabled_repositories, { + integer repo_id = FindRepoIdByAlias (repo_alias); + + if (repo_id == nil) { + y2error ("Cannot enable repo (alias)%1, repo not found ", repo_alias); + Report::Error (sformat(_("Cannot enable repository with alias +%1 +Repository was not found."), repo_alias)); + return; + } + + y2milestone ("Enabling repository %1 returned: %2", repo_id, Pkg::SourceSetEnabled (repo_id, true)); + }); + + Pkg::SourceSaveAll(); + Wagon::InitPkg(); + // Remove all the migration products using packages approach manually // Removing via ResolvableRemove + PkgSolve usually produces errors, // dependency loops etc. Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp Wed Jan 27 12:06:50 2010 @@ -135,6 +135,77 @@ return true; } + /** + * Finds all products that contain information about their migration product + * finds which repositories provide these products and disables the + * repositories. + * + * @see BNC #573092 + */ + boolean FindOldRepositoriesToBeDisabled () { + if (Wagon::InitPkg() != true) { + Report::Error (_("Unable to initialize the package manager.")); + return false; + } + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + if (p["status"]:`unknown != `installed) { + y2milestone ("Product %1 (%2) is not installed, skipping...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + if (! haskey (p, "upgrades") || p["upgrades"]:[] == []) { + y2warning ("Product %1 (%2) does not contain 'upgrades' section...", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + return; + } + + y2milestone ("Going to disable repositories providing product %1 (%2)", + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined"); + + if (p["name"]:"" == nil || p["name"]:"" == "") { + y2error ("Product %1 doesn't have a name, reverting will be impossible", p); + Report::Error (sformat(_("Product %1 does not have a machine-readable 'name'. +Cannot disable ."), p["short_name"]:p["display_name"]:"not-defined")); + } + + // Find all available products + list <map <string, any> > matching_products = Pkg::ResolvableProperties (p["name"]:"", `product, ""); + matching_products = filter (map <string, any> one_product, matching_products, { + return (one_product["status"]:`unknown == `available); + }); + + if (matching_products == nil || size (matching_products) == 0) { + y2error ("Nothing provides product: '%1'", p["name"]:""); + Report::Error (sformat(_("No repository provides product %1 (%2). +Migration might not work."), + p["name"]:"not-defined", p["short_name"]:p["display_name"]:"not-defined")); + } + + integer repo_id = nil; + map repo_details = nil; + + foreach (map <string, any> one_product, matching_products, { + repo_id = one_product["source"]:-1; + + if (repo_id < 0) { + y2error ("Available product with source<0: %1", Wagon::MinimizeProductMap (one_product)); + return; + } + + repo_details = Pkg::SourceGeneralData (repo_id); + Wagon::repositories_to_disable = add (Wagon::repositories_to_disable, repo_details["alias"]:""); + }); + }); + + y2milestone ("Repositories to be disabled later: %1", Wagon::repositories_to_disable); + + return true; + } + Wagon::InitPkg(); Wagon::ReadProductsBeforeMigration(); @@ -183,6 +254,9 @@ ResetPackager(); + // Remembers all repositories that will be disabled later (after registration run) + FindOldRepositoriesToBeDisabled(); + y2milestone ("Returning: %1", ret); return ret; Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp Wed Jan 27 12:06:50 2010 @@ -0,0 +1,62 @@ +/** + * File: + * clients/wagon_migration_products.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id$ + * + */ + +{ + /** + * Modify repositories as needed. + */ + + textdomain "wagon"; + + import "Wagon"; + import "GetInstArgs"; + import "Report"; + + include "wagon/common_func.ycp"; + + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } + + symbol ret = `auto; + + Wagon::InitPkg(); + + integer repo_id = nil; + + foreach (string repo_alias, Wagon::repositories_to_disable, { + repo_id = FindRepoIdByAlias (repo_alias); + + if (repo_id == nil) { + y2error ("Cannot disable repository %1, alias not found", repo_alias); + return; + } + + y2milestone ("Disabling repository (alias)%1 (id)%2 returned: %3", repo_alias, repo_id, Pkg::SourceSetEnabled (repo_id, false)); + Wagon::disabled_repositories = add (Wagon::disabled_repositories, repo_alias); + }); + + if (size (Wagon::disabled_repositories) > 0) + Pkg::SourceSaveAll(); + + ResetPackager(); + + y2milestone ("Returning: %1", ret); + + return ret; +} Modified: branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Wed Jan 27 12:06:50 2010 @@ -31,6 +31,7 @@ <module>update_online_mechanism</module> <module>install_migration_products</module> <module>suse_register_workflow</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -60,6 +61,7 @@ <module>suse_register_workflow</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -85,6 +87,7 @@  <module>update_url_dialog</module> <module>suse_register_workflow</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -111,6 +114,7 @@ <module>update_url_dialog</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_modify_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -256,6 +260,11 @@ </module> <module> + <name>wagon_modify_repositories</name> + <execute>wagon_modify_repositories</execute> + </module> + + <module> <heading>yes</heading> <label>Migration</label> </module> Modified: branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp Wed Jan 27 12:06:50 2010 @@ -125,4 +125,21 @@ Wagon::InitPkg(); Pkg::PkgSolve (true); } + + integer FindRepoIdByAlias (string repo_alias) { + integer repo_id = nil; + + map one_repo = $[]; + + foreach (integer repo_id_to_check, Pkg::SourceGetCurrent (false /* all repos */), { + one_repo = Pkg::SourceGeneralData (repo_id_to_check); + + if (one_repo["alias"]:"" == repo_alias) { + repo_id = repo_id_to_check; + break; + } + }); + + return repo_id; + } } Modified: branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Wed Jan 27 12:06:50 2010 @@ -42,6 +42,12 @@ // Products installed before the migration global list <map <string, string> > products_before_migration = []; + // Repositories that were disabled by wagon during migration + // List of aliases (unique identification) + // BNC #573092 + global list <string> disabled_repositories = []; + global list <string> repositories_to_disable = []; + // When aborting before the real migration starts, we can still // revert to the old products global boolean abort_can_revert_products = true; @@ -499,6 +505,5 @@ return true; } - /* EOF */ } Modified: branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/yas… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Wed Jan 27 12:06:50 2010 @@ -7,6 +7,9 @@ # <upgrades> section from product file Requires: yast2-pkg-bindings >= 2.17.39.2 +# Called in proposal and in code +Requires: yast2-packager yast2-update yast2-add-on + BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update # xmllint -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0