June 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] Build failed in Hudson: webyast-client-head-i586 #1166
by Hudson Integration Service 26 Jul '10

26 Jul '10

See <http://yast.suse.de:3334/job/webyast-client-head-i586/1166/changes> Changes: [Stefan Schubert] taking headline instead ------------------------------------------ Started by an SCM change Checkout [workspace] $ git fetch Checking out origin/master [workspace] $ git checkout -f origin/master Previous HEAD position was 7acb35e... refactor js out from view HEAD is now at 749c5a1... taking headline instead [workspace] $ git rev-parse origin/master [workspace] $ git log --numstat -M --summary --pretty=raw 7acb35e088890dbd08cebb084ec8c7e32a35e17d..749c5a17e6b3fec387ce4a3890252f3d15dd7fa5 [locks-and-latches] Checking to see if we really have the locks [locks-and-latches] Have all the locks, build can start [workspace] $ /bin/sh -xe /tmp/hudson5496979343038785662.sh + sudo -E /data/hudson/bin/build-chroot.sh webyast web-client head-i586 SCRIPT ID: I am /data/hudson/bin/build-chroot.sh at <http://yast.suse.de:3334/job/webyast-client-head-i586/ws/> ..copying source code <http://yast.suse.de:3334/job/webyast-client-head-i586/ws/*> /data/hudson/HUDSON-CHROOT/webyast-head-i586/src/web-client ..copying make script to /data/hudson/HUDSON-CHROOT/webyast-head-i586/root ... mounting sys ... mounting proc ... mounting pts ... switching to chroot and starting build SCRIPT ID: I am /root/make-zypp.sh at / ??,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,?? + echo webyast-web-client webyast-web-client + case "${MODULE}" in + SUBDIR=webclient + cd /src/web-client + echo /src/web-client /src/web-client + ls Makefile Rakefile doc gettext20 index.html.template plugins selenium webclient + [[ web-client == \r\e\s\t\-\s\e\r\v\i\c\e ]] + rake check_syntax (in /src/web-client) run into project webclient Missing the Rails gem. Please `gem install -v= rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed. (in /src/web-client/webclient) rake aborted! Error on execute task check_syntax on webclient /src/web-client/Rakefile:19 (See full trace by running task with --trace) ++ error_exit 1 ++ echo 'ERROR: detected exit code 1' ERROR: detected exit code 1 ++ 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 166

[yast-commit] Build failed in Hudson: webyast-service-head-i586 #968
by Hudson Integration Service 02 Jul '10

02 Jul '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/968/changes> Changes: [Michal Zugec] users: don't use xml parser for JSON ------------------------------------------ [...truncated 4677 lines...] + /bin/mkdir -p /usr/src/packages/BUILDROOT + /bin/mkdir /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386 + cd www + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.ToRkfj + umask 022 + cd /usr/src/packages/BUILD + cd www + mkdir -p /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/srv/www/yastws/vendor/plugins/roles + cp -a COPYING README Rakefile app config doc init.rb install.rb tasks test uninstall.rb /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/srv/www/yastws/vendor/plugins/roles/ + rm -f /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/srv/www/yastws/vendor/plugins/roles/COPYING + mkdir -p /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/usr/share/PolicyKit/policy + mkdir -p /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/var/lib/yastws//roles + cp /src/rest-service/plugins/roles/package/roles.yml /src/rest-service/plugins/roles/package/roles_assign.yml /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/var/lib/yastws//roles + cp /src/rest-service/plugins/roles/package/org.opensuse.yast.roles.policy /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/usr/share/PolicyKit/policy/ + RPM_BUILD_ROOT=/usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386 + export RPM_BUILD_ROOT + test -x /usr/sbin/Check -a 0 = 0 -o -x /usr/sbin/Check -a '!' -z /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386 + echo 'I call /usr/sbin/Check...' I call /usr/sbin/Check... + /usr/sbin/Check + /usr/lib/rpm/brp-compress + /usr/lib/rpm/brp-strip-debug + /usr/lib/rpm/brp-check-la + /usr/lib/rpm/brp-symlink + /usr/lib/rpm/brp-desktop WARNING: '/usr/lib/rpm/brp-desktop.data/suse-screensavers.menu' does not exist WARNING: '/usr/lib/rpm/brp-desktop.data/preferences-gnome.menu' does not exist WARNING: '/usr/lib/rpm/brp-desktop.data/applications-kmenuedit.menu' does not exist + /usr/lib/rpm/brp-rpath + /usr/lib/rpm/brp-pie + /usr/lib/rpm/brp-rootfs + /usr/lib/rpm/brp-tcl + /usr/lib/rpm/brp-check-python + /usr/lib/rpm/brp-check-bytecode-version + /usr/lib/rpm/brp-boot-scripts + /usr/lib/rpm/brp-hook Executing(%check): /bin/sh -e /var/tmp/rpm-tmp.vNxl1b + umask 022 + cd /usr/src/packages/BUILD + cd www + export RAILS_PARENT=/srv/www/yastws + RAILS_PARENT=/srv/www/yastws + export TEST_DB_PATH=/tmp/webyast_test.sqlite3 + TEST_DB_PATH=/tmp/webyast_test.sqlite3 + rm -rf /tmp/webyast_test.sqlite3 + RAILS_ENV=test + rake db:create DEPRECATION WARNING: Rake tasks in vendor/plugins/users/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /usr/src/packages/BUILD/www) Using DB file for tests: /tmp/webyast_test.sqlite3 + RAILS_ENV=test + rake db:schema:load DEPRECATION WARNING: Rake tasks in vendor/plugins/users/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) *** registering plugins *** (in /usr/src/packages/BUILD/www) Using DB file for tests: /tmp/webyast_test.sqlite3 -- create_table("accounts", {:force=>true}) -> 0.2935s -- initialize_schema_migrations_table() -> 0.3439s -- assume_migrated_upto_version(20090423142313, "db/migrate") -> 0.1518s Loaded suite /usr/bin/rake Started Finished in 0.000168 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications + RAILS_ENV=test + ADD_BUILD_PATH=1 + rake test DEPRECATION WARNING: Rake tasks in vendor/plugins/users/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) *** registering plugins *** /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/role_test.rb" (in /usr/src/packages/BUILD/www) Using DB file for tests: /tmp/webyast_test.sqlite3 *** registering plugins *** Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started./test/unit/role_test.rb:29: warning: already initialized constant ROLES_DEF_PATH ./test/unit/role_test.rb:30: warning: already initialized constant ROLES_ASSIGN_PATH ../test/unit/role_test.rb:29: warning: already initialized constant ROLES_DEF_PATH ./test/unit/role_test.rb:30: warning: already initialized constant ROLES_ASSIGN_PATH ../test/unit/role_test.rb:29: warning: already initialized constant ROLES_DEF_PATH ./test/unit/role_test.rb:30: warning: already initialized constant ROLES_ASSIGN_PATH ../test/unit/role_test.rb:29: warning: already initialized constant ROLES_DEF_PATH ./test/unit/role_test.rb:30: warning: already initialized constant ROLES_ASSIGN_PATH ../test/unit/role_test.rb:29: warning: already initialized constant ROLES_DEF_PATH ./test/unit/role_test.rb:30: warning: already initialized constant ROLES_ASSIGN_PATH ../test/unit/role_test.rb:29: warning: already initialized constant ROLES_DEF_PATH ./test/unit/role_test.rb:30: warning: already initialized constant ROLES_ASSIGN_PATH . Finished in 0.537826 seconds. 6 tests, 24 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/roles_controller_test.rb" *** registering plugins *** Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started./test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH ../test/functional/roles_controller_test.rb:32: warning: already initialized constant ROLES_DEF_PATH ./test/functional/roles_controller_test.rb:33: warning: already initialized constant ROLES_ASSIGN_PATH . Finished in 1.841866 seconds. 11 tests, 15 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Loaded suite /usr/bin/rake Started Finished in 5.0e-05 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications + exit 0 Processing files: webyast-roles-ws-0.1.0-0.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.DL3FLp + umask 022 + cd /usr/src/packages/BUILD + cd www + DOCDIR=/usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/usr/share/doc/packages/webyast-roles-ws + export DOCDIR + rm -rf /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/usr/share/doc/packages/webyast-roles-ws + /bin/mkdir -p /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/usr/share/doc/packages/webyast-roles-ws + cp -pr COPYING /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386/usr/share/doc/packages/webyast-roles-ws + exit 0 Finding Provides: /usr/lib/rpm/find-provides webyast-roles-ws Finding Requires: /usr/lib/rpm/find-requires webyast-roles-ws Finding Supplements: /usr/lib/rpm/find-supplements webyast-roles-ws Provides: WebYaST(org.opensuse.yast.roles) Requires(interp): /bin/sh Requires(rpmlib): rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(pre): yast2-webservice Requires(post): /bin/sh Requires(preun): yast2-webservice Processing files: webyast-roles-ws-testsuite-0.1.0-0.noarch Finding Provides: /usr/lib/rpm/find-provides webyast-roles-ws Finding Requires: /usr/lib/rpm/find-requires webyast-roles-ws Finding Supplements: /usr/lib/rpm/find-supplements webyast-roles-ws Requires(rpmlib): rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Checking for unpackaged file(s): /usr/lib/rpm/check-files /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386 Wrote: /artifacts/webyast/rest-service/rpms/noarch/webyast-roles-ws-0.1.0-0.noarch.rpm Wrote: /artifacts/webyast/rest-service/rpms/noarch/webyast-roles-ws-testsuite-0.1.0-0.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.n1oQiB + umask 022 + cd /usr/src/packages/BUILD + cd www + rm -rf /usr/src/packages/BUILDROOT/webyast-roles-ws-0.1.0-0.i386 + exit 0 + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + popd /src/rest-service + for rpmdir in '${SUBDIR}/package' '`find ./plugins -name package | grep -v "rpam\|ruby-polkit"`' ++ dirname ./plugins/users/package + pkgdir=./plugins/users ++ basename ./plugins/users + pkgname=users + destination=/artifacts/webyast/rest-service/package/yast2-webservice-users + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-users + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-users/*' + rm -rf ./plugins/users/package/www + cp -r ./plugins/users/package/org.opensuse.yast.modules.yapi.users.policy ./plugins/users/package/webyast-users-ws.changes ./plugins/users/package/webyast-users-ws.spec ./plugins/users/package/www.tar.bz2 /artifacts/webyast/rest-service/package/yast2-webservice-users + pushd ./plugins/users/package /src/rest-service/plugins/users/package /src/rest-service + case "${pkgdir}" in + build_spec + rpm --rebuilddb + mkdir -p /tmp + mkdir -p /artifacts/webyast/rest-service/rpms + mkdir -p /usr/src/packages/BUILD + 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' webyast-users-ws.spec error: line 1: Unknown tag: ------------------------------------------------------------------- + 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 Michal Zugec 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 15

[yast-commit] Build failed in Hudson: webyast-service-head-i586 #959
by Hudson Integration Service 30 Jun '10

30 Jun '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/959/changes> Changes: [Josef Reidinger] Generate properly json, so ActiveResource understand it [Josef Reidinger] generate properly json for resources (Hash.from(xml).to_json is not valid as you don't want serialize hash, but model ------------------------------------------ [...truncated 395 lines...] (in /src/rest-service/plugins/time) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/activedirectory) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/mail) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/roles) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) test/unit/user_test.rb:55: warning: don't put space before argument parentheses (in /src/rest-service/plugins/users) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/network) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/example_plugin) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/basesystem) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/system) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/ldap) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/administrator) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/registration) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/firewall) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/software) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/services) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/eulas) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/ntp) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) (in /src/rest-service/plugins/status) ** Invoke check_syntax (first_time) ** Execute check_syntax * Starting syntax check... * Done + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + export GEM_PATH=/usr/local/lib/ruby/gems/1.8/gems + GEM_PATH=/usr/local/lib/ruby/gems/1.8/gems + export CI_REPORTS=results + CI_REPORTS=results + export RAILS_ENV=test + RAILS_ENV=test + pushd webservice /src/rest-service/webservice /src/rest-service + RAILS_ENV=test + rake db:create db:migrate DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) db/test.sqlite3 already exists *** registering plugins *** (in /src/rest-service/webservice) == Accounts: migrating ======================================================= -- create_table("accounts", {:force=>true}) -> 0.0046s == Accounts: migrated (0.0049s) ============================================== Loaded suite /usr/bin/rake Started Finished in 0.000169 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + popd /src/rest-service + '[' -d coverage ']' + mkdir coverage + [[ rest-service == \r\e\s\t\-\s\e\r\v\i\c\e ]] + webservice/test/dbus-launch-simple rake test (in /src/rest-service) DEPRECATION WARNING: Rake tasks in vendor/plugins/rails_rcov/tasks are deprecated. Use lib/tasks instead. (called from /usr/lib/ruby/gems/1.8/gems/rails-2.3.8/lib/tasks/rails.rb:10) *** registering plugins *** /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/background_status_test.rb" "test/unit/permission_test.rb" "test/unit/base_model_test.rb" "test/unit/yast_service_test.rb" "test/unit/resource_test.rb" "test/unit/restdoc_test.rb" "test/unit/account_test.rb" "test/unit/vendor_setting_test.rb" "test/unit/yast/settings_model_test.rb" "test/unit/yast/config_file_test.rb" "test/unit/yast_roles_test.rb" "test/unit/background_manager_test.rb" "test/unit/brute_force_protection_test.rb" (in /src/rest-service/webservice) *** registering plugins *** *** registering plugins *** ./test/unit/yast/../../../config/environment.rb:131: warning: already initialized constant USER_ROLES_CONFIG Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ............F.F...../test/unit/brute_force_protection_test.rb:33: warning: already initialized constant TIMEOUT_ON_FAIL .../test/unit/brute_force_protection_test.rb:41: warning: already initialized constant TIMEOUT_ON_FAIL ...............permission_check2: NoPermissionException .permission_check2: NoPermissionException ..permission_check2: NoPermissionException ..permission_check2: NoPermissionException ... Finished in 0.924935 seconds. 1) Failure: test_attr_serializable(BaseModelTest) [/test/unit/base_model_test.rb:162:in `test_attr_serializable' activesupport (2.3.8) lib/active_support/testing/setup_and_teardown.rb:62:in `__send__' activesupport (2.3.8) lib/active_support/testing/setup_and_teardown.rb:62:in `run']: <"dev"> expected but was <nil>. 2) Failure: test_json_serialization(BaseModelTest) [/test/unit/base_model_test.rb:140:in `test_json_serialization' activesupport (2.3.8) lib/active_support/testing/setup_and_teardown.rb:62:in `__send__' activesupport (2.3.8) lib/active_support/testing/setup_and_teardown.rb:62:in `run']: <"last"> expected but was <nil>. 44 tests, 151 assertions, 2 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/vendor_settings_controller_test.rb" "test/functional/resources_route_test.rb" "test/functional/error_controller_test.rb" "test/functional/resources_registration_test.rb" "test/functional/resources_controller_test.rb" "test/functional/sessions_controller_test.rb" "test/functional/raising_controller_test.rb" "test/functional/authenticated_system_test.rb" "test/functional/lib_session_test.rb" "test/functional/permissions_controller_test.rb" "test/functional/restdoc_controller_test.rb" *** registering plugins *** ./test/functional/../../config/environment.rb:131: warning: already initialized constant USER_ROLES_CONFIG Session::VERSION <2.4.0> Session.use_spawn <false> Session.use_open3 <false> Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ......................does_not_exist failed to load: No such file or directory - does_not_exist ............................... Finished in 13.227121 seconds. 53 tests, 98 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Errors running test:units! rake aborted! Error on execute '/usr/bin/rake test' inside webservice/ /src/rest-service/Rakefile:41 (See full trace by running task with --trace) ++ error_exit 1 ++ echo 'ERROR: detected exit code 1' ERROR: detected exit code 1 ++ 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 8

[yast-commit] r62173 - /tags/stable-2_19_0/instserver/
by lslezak＠svn.opensuse.org 29 Jun '10

29 Jun '10

Author: lslezak Date: Tue Jun 29 15:43:51 2010 New Revision: 62173 URL: http://svn.opensuse.org/viewcvs/yast?rev=62173&view=rev Log: Created tag stable-2_19_0 for instserver Added: tags/stable-2_19_0/instserver/ - copied from r62172, trunk/instserver/ -- 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] r62172 - in /trunk/instserver: VERSION package/yast2-instserver.changes src/Instserver.ycp
by lslezak＠svn.opensuse.org 29 Jun '10

29 Jun '10

Author: lslezak Date: Tue Jun 29 15:43:44 2010 New Revision: 62172 URL: http://svn.opensuse.org/viewcvs/yast?rev=62172&view=rev Log: - fixed creating SLP reg. files: fixed reading supported architectures from content file (bnc#608834), fixed also for SLES10 repositories (bnc#616307) - fixed reescaping already escaped values - 2.19.0 Modified: trunk/instserver/VERSION trunk/instserver/package/yast2-instserver.changes trunk/instserver/src/Instserver.ycp Modified: trunk/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/VERSION?rev=62172&r1=… ============================================================================== --- trunk/instserver/VERSION (original) +++ trunk/instserver/VERSION Tue Jun 29 15:43:44 2010 @@ -1 +1 @@ -2.18.3 +2.19.0 Modified: trunk/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/package/yast2-instser… ============================================================================== --- trunk/instserver/package/yast2-instserver.changes (original) +++ trunk/instserver/package/yast2-instserver.changes Tue Jun 29 15:43:44 2010 @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 29 10:14:47 UTC 2010 - lslezak(a)suse.cz + +- fixed creating SLP reg. files: fixed reading supported + architectures from content file (bnc#608834), fixed also for + SLES10 repositories (bnc#616307) +- fixed reescaping already escaped values +- 2.19.0 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/Instserver.ycp?re… ============================================================================== --- trunk/instserver/src/Instserver.ycp (original) +++ trunk/instserver/src/Instserver.ycp Tue Jun 29 15:43:44 2010 @@ -573,6 +573,76 @@ return ret; } +string subreplace(string text, string in, string out) +{ + list<string> parts = splitstring(text, "\\"); + + // don't modify the first item, it's the non-matched prefix + boolean first = true; + list<string> new_parts = maplist(string p, parts, + { + if (first) + { + first = false; + return p; + } + + string new_part = p; + + if (in == substring(p, 0, 2)) + { + new_part = out + substring(p, 2); + } + else + { + // put the backslash back if the remaining part doesn't match + new_part = "\\" + p; + } + + return new_part; + } + ); + + string ret = mergestring(new_parts, ""); + y2debug("unescaped str: text: %1, in: %2, out: %3 => %4", text, in, out, ret); + + return ret; +} + +// this is an oppsite function to EscapeSLPData() +// it takes SLP input and unescpaes the backslash sequences +map<string, string> UnEscapeSLPData(map<string, string> a) +{ + map<string, string> ret = $[]; + + foreach(string key, string value, a, + { + // String::Replace() enters endless loop in '\' -> '\5c' conversion + // use splitstring() and mergestring() builtins instead + string new_key = key; + new_key = subreplace(new_key, "2e", "."); + new_key = subreplace(new_key, "3d", "="); + new_key = subreplace(new_key, "23", "#"); + new_key = subreplace(new_key, "3b", ";"); + new_key = subreplace(new_key, "5c", "\\"); + + string new_value = value; + new_value = subreplace(new_value, "28", "("); + new_value = subreplace(new_value, "29", ")"); + new_value = subreplace(new_value, "2c", ","); + new_value = subreplace(new_value, "23", "#"); + new_value = subreplace(new_value, "3b", ";"); + new_value = subreplace(new_value, "5c", "\\"); + + ret[new_key] = new_value; + } + ); + + y2milestone("Unescaped SLP attributes: %1 -> %2", a, ret); + + return ret; +} + /* * Return the IP address of the local machine * @return string IP Address @@ -605,6 +675,48 @@ return hostname; } +list<string> basearch_mapping(string basearch) +{ + map<string,list<string> > mapping = $[ + "i586" : [ "i586", "i686" ], + "mips" : [ "mips", "mips64" ], + "ppc" : [ "ppc", "ppc64" ], + "sparc" : [ "sparc", "sparc64"], + "x86_64" : [ "x86_64"] + ]; + + if (!haskey(mapping, basearch)) + { + y2warning("Unknown BASEARCH: %1", basearch); + } + + // return the original basearch if mapping is unknown + list<string> ret = mapping[basearch]:[basearch]; + + y2milestone("Using BASEARCH mapping: %1 -> %2", basearch, ret); + + return ret; +} + +list<string> get_machines(string basearch_value) +{ + list<string> archs = splitstring(basearch_value, " "); + archs = filter(string a, archs, {return a != nil && a != "";}); + + list<string> ret = []; + + foreach(string a, archs, + { + ret = (list<string>)merge(ret, basearch_mapping(a)); + } + ); + + y2milestone("Final BASEARCH mapping: %1", ret); + + return ret; +} + + /** * Write SLP configuration */ @@ -680,21 +792,38 @@ string machine = ""; list<string> machines = []; foreach(string k, any v, cm, ``{ - if (issubstring(k, "ARCH")) + y2debug("Read Key: '%1'", k); + + if (k == "BASEARCHS") + { + // machine mapping + machines = get_machines((string)v); + } + else if (issubstring(k, "ARCH")) { - machines = (list<string>)union (machines, splitstring((string)v, " ") ); + string a = regexpsub(k, "ARCH\\.(.*)", "\\1"); + + if (a != nil) + { + y2milestone("Found %1 key, adding arch %2 to the list", k, a); + machines = add(machines, a); + } } }); machines = filter(string m , machines, ``(m!="" && m!="noarch")); machines = toset(machines); + + // sort the list so it looks better + machines = sort(machines); + string machines_string = mergestring(machines, ","); + y2debug("machines: %1", machines); - attr["machine"] = mergestring(machines, ","); - y2debug("machine: %1", machine); // preserve the old configuration if (SCR::Read(.target.size, read_file) >= 0) { y2milestone("Existing reg.d file found: %1", read_file); + map<string, string> old_attr = $[]; string reg_cont = (string)SCR::Read(.target.string, read_file); list<string> lines = splitstring(reg_cont, "\n"); @@ -706,11 +835,24 @@ if (parsed_name != nil) { y2milestone("Reusing attribute: %1=%2", parsed_name, parsed_value); - attr[parsed_name] = parsed_value; + old_attr[parsed_name] = parsed_value; } } ); + // unescape the read value + old_attr = UnEscapeSLPData(old_attr); + + if (haskey(old_attr, "machine")) + { + // backup the "machine" value + machines_string = old_attr["machine"]:""; + } + + // merge them with read values, + // keep the original setting if a value was already set + attr = (map<string, string>)union(attr, old_attr); + /* TODO: checking? // don't check the overwritten config file @@ -728,6 +870,11 @@ // escape invalid characters attr = EscapeSLPData(attr); + // replace the machine option after escaping, + // it actually _is_ a list so "," is valid here + attr["machine"] = machines_string; + y2milestone("machine: %1", attr["machine"]:""); + y2milestone("registering SLP service: serv: %1, attr: %2, regfile: %3", serv, attr, regfile); boolean ret = SLP::RegFile(serv, attr, regfile ); -- 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] r62171 - /branches/tmp/jsrain/unattended-migration/yast2/library/modules/Mode.ycp
by jsrain＠svn.opensuse.org 29 Jun '10

29 Jun '10

Author: jsrain Date: Tue Jun 29 15:29:06 2010 New Revision: 62171 URL: http://svn.opensuse.org/viewcvs/yast?rev=62171&view=rev Log: introduced a new mode for AutoYaST driven upgrade Modified: branches/tmp/jsrain/unattended-migration/yast2/library/modules/Mode.ycp Modified: branches/tmp/jsrain/unattended-migration/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/yast2/library/modules/Mode.ycp (original) +++ branches/tmp/jsrain/unattended-migration/yast2/library/modules/Mode.ycp Tue Jun 29 15:29:06 2010 @@ -88,6 +88,8 @@ { _mode ="repair"; } + // FIXME FIXME FIXME this is a hack for DUD only + _mode = "autoupgrade"; } } @@ -113,7 +115,7 @@ if (! contains ( [ "installation", "update", "normal", "repair", "autoinstallation", "autoinst_config", - "live_installation" + "live_installation", "autoupgrade" ], new_mode)) { @@ -196,7 +198,7 @@ * we're doing an update */ global boolean update () { - return mode () == "update"; + return mode () == "update" || mode () == "autoupgrade"; } global boolean Depeche () { @@ -225,6 +227,13 @@ } /** + * doing auto-upgrade + */ +global boolean autoupgrade () { + return mode () == "autoupgrade"; +} + +/** * configuration for auto-installation, only in running system */ global boolean config () { -- 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] r62170 - /trunk/libyui/src/YTreeItem.h
by kkaempf＠svn.opensuse.org 29 Jun '10

29 Jun '10

Author: kkaempf Date: Tue Jun 29 13:40:45 2010 New Revision: 62170 URL: http://svn.opensuse.org/viewcvs/yast?rev=62170&view=rev Log: rename addChild parameter to item_disown so SWIG (libyui-bindings) knows about transferral of memory ownership Modified: trunk/libyui/src/YTreeItem.h Modified: trunk/libyui/src/YTreeItem.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YTreeItem.h?rev=62170… ============================================================================== --- trunk/libyui/src/YTreeItem.h (original) +++ trunk/libyui/src/YTreeItem.h Tue Jun 29 13:40:45 2010 @@ -117,7 +117,7 @@ * automatically add themselves to their parent, so applications will * normally not have to call this function. **/ - virtual void addChild( YItem * child ); + virtual void addChild( YItem * item_disown ); /** * Delete all child items. -- 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] r62169 - /tags/branch-Code-11-2_17_6/instserver/
by lslezak＠svn.opensuse.org 29 Jun '10

29 Jun '10

Author: lslezak Date: Tue Jun 29 13:38:56 2010 New Revision: 62169 URL: http://svn.opensuse.org/viewcvs/yast?rev=62169&view=rev Log: Created tag branch-Code-11-2_17_6 for instserver Added: tags/branch-Code-11-2_17_6/instserver/ - copied from r62168, branches/SuSE-Code-11-Branch/instserver/ -- 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] r62168 - in /branches/SuSE-Code-11-Branch/instserver: ./ VERSION package/yast2-instserver.changes src/Instserver.ycp
by lslezak＠svn.opensuse.org 29 Jun '10

29 Jun '10

Author: lslezak Date: Tue Jun 29 13:38:52 2010 New Revision: 62168 URL: http://svn.opensuse.org/viewcvs/yast?rev=62168&view=rev Log: - fixed creating SLP reg. files: fixed reading supported architectures from content file (bnc#608834), fixed also for SLES10 repositories (bnc#616307) - fixed reescaping already escaped values - 2.17.6 Modified: branches/SuSE-Code-11-Branch/instserver/ (props changed) branches/SuSE-Code-11-Branch/instserver/VERSION branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp Modified: branches/SuSE-Code-11-Branch/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/instserve… ============================================================================== --- branches/SuSE-Code-11-Branch/instserver/VERSION (original) +++ branches/SuSE-Code-11-Branch/instserver/VERSION Tue Jun 29 13:38:52 2010 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/instserve… ============================================================================== --- branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes (original) +++ branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes Tue Jun 29 13:38:52 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Jun 29 10:14:47 UTC 2010 - lslezak(a)suse.cz + +- fixed creating SLP reg. files: fixed reading supported + architectures from content file (bnc#608834), fixed also for + SLES10 repositories (bnc#616307) +- fixed reescaping already escaped values +- 2.17.6 + +------------------------------------------------------------------- Tue Jul 7 14:53:17 CEST 2009 - lslezak(a)suse.cz - including fixes for bnc#492367 and bnc#475676 Modified: branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/instserve… ============================================================================== --- branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp (original) +++ branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp Tue Jun 29 13:38:52 2010 @@ -572,6 +572,76 @@ return ret; } +string subreplace(string text, string in, string out) +{ + list<string> parts = splitstring(text, "\\"); + + // don't modify the first item, it's the non-matched prefix + boolean first = true; + list<string> new_parts = maplist(string p, parts, + { + if (first) + { + first = false; + return p; + } + + string new_part = p; + + if (in == substring(p, 0, 2)) + { + new_part = out + substring(p, 2); + } + else + { + // put the backslash back if the remaining part doesn't match + new_part = "\\" + p; + } + + return new_part; + } + ); + + string ret = mergestring(new_parts, ""); + y2debug("unescaped str: text: %1, in: %2, out: %3 => %4", text, in, out, ret); + + return ret; +} + +// this is an oppsite function to EscapeSLPData() +// it takes SLP input and unescpaes the backslash sequences +map<string, string> UnEscapeSLPData(map<string, string> a) +{ + map<string, string> ret = $[]; + + foreach(string key, string value, a, + { + // String::Replace() enters endless loop in '\' -> '\5c' conversion + // use splitstring() and mergestring() builtins instead + string new_key = key; + new_key = subreplace(new_key, "2e", "."); + new_key = subreplace(new_key, "3d", "="); + new_key = subreplace(new_key, "23", "#"); + new_key = subreplace(new_key, "3b", ";"); + new_key = subreplace(new_key, "5c", "\\"); + + string new_value = value; + new_value = subreplace(new_value, "28", "("); + new_value = subreplace(new_value, "29", ")"); + new_value = subreplace(new_value, "2c", ","); + new_value = subreplace(new_value, "23", "#"); + new_value = subreplace(new_value, "3b", ";"); + new_value = subreplace(new_value, "5c", "\\"); + + ret[new_key] = new_value; + } + ); + + y2milestone("Unescaped SLP attributes: %1 -> %2", a, ret); + + return ret; +} + /* * Return the IP address of the local machine * @return string IP Address @@ -604,6 +674,48 @@ return hostname; } +list<string> basearch_mapping(string basearch) +{ + map<string,list<string> > mapping = $[ + "i586" : [ "i586", "i686" ], + "mips" : [ "mips", "mips64" ], + "ppc" : [ "ppc", "ppc64" ], + "sparc" : [ "sparc", "sparc64"], + "x86_64" : [ "x86_64"] + ]; + + if (!haskey(mapping, basearch)) + { + y2warning("Unknown BASEARCH: %1", basearch); + } + + // return the original basearch if mapping is unknown + list<string> ret = mapping[basearch]:[basearch]; + + y2milestone("Using BASEARCH mapping: %1 -> %2", basearch, ret); + + return ret; +} + +list<string> get_machines(string basearch_value) +{ + list<string> archs = splitstring(basearch_value, " "); + archs = filter(string a, archs, {return a != nil && a != "";}); + + list<string> ret = []; + + foreach(string a, archs, + { + ret = (list<string>)merge(ret, basearch_mapping(a)); + } + ); + + y2milestone("Final BASEARCH mapping: %1", ret); + + return ret; +} + + /** * Write SLP configuration */ @@ -679,21 +791,38 @@ string machine = ""; list<string> machines = []; foreach(string k, any v, cm, ``{ - if (issubstring(k, "ARCH")) + y2debug("Read Key: '%1'", k); + + if (k == "BASEARCHS") + { + // machine mapping + machines = get_machines((string)v); + } + else if (issubstring(k, "ARCH")) { - machines = (list<string>)union (machines, splitstring((string)v, " ") ); + string a = regexpsub(k, "ARCH\\.(.*)", "\\1"); + + if (a != nil) + { + y2milestone("Found %1 key, adding arch %2 to the list", k, a); + machines = add(machines, a); + } } }); machines = filter(string m , machines, ``(m!="" && m!="noarch")); machines = toset(machines); + + // sort the list so it looks better + machines = sort(machines); + string machines_string = mergestring(machines, ","); + y2debug("machines: %1", machines); - attr["machine"] = mergestring(machines, ","); - y2debug("machine: %1", machine); // preserve the old configuration if (SCR::Read(.target.size, read_file) >= 0) { y2milestone("Existing reg.d file found: %1", read_file); + map<string, string> old_attr = $[]; string reg_cont = (string)SCR::Read(.target.string, read_file); list<string> lines = splitstring(reg_cont, "\n"); @@ -705,11 +834,24 @@ if (parsed_name != nil) { y2milestone("Reusing attribute: %1=%2", parsed_name, parsed_value); - attr[parsed_name] = parsed_value; + old_attr[parsed_name] = parsed_value; } } ); + // unescape the read value + old_attr = UnEscapeSLPData(old_attr); + + if (haskey(old_attr, "machine")) + { + // backup the "machine" value + machines_string = old_attr["machine"]:""; + } + + // merge them with read values, + // keep the original setting if a value was already set + attr = (map<string, string>)union(attr, old_attr); + /* TODO: checking? // don't check the overwritten config file @@ -727,6 +869,11 @@ // escape invalid characters attr = EscapeSLPData(attr); + // replace the machine option after escaping, + // it actually _is_ a list so "," is valid here + attr["machine"] = machines_string; + y2milestone("machine: %1", attr["machine"]:""); + y2milestone("registering SLP service: serv: %1, attr: %2, regfile: %3", serv, attr, regfile); boolean ret = SLP::RegFile(serv, attr, regfile ); -- 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] r62167 - /tags/branch-Code-11-SP1-2_17_6/instserver/
by lslezak＠svn.opensuse.org 29 Jun '10

29 Jun '10

Author: lslezak Date: Tue Jun 29 13:38:28 2010 New Revision: 62167 URL: http://svn.opensuse.org/viewcvs/yast?rev=62167&view=rev Log: Created tag branch-Code-11-SP1-2_17_6 for instserver Added: tags/branch-Code-11-SP1-2_17_6/instserver/ (props changed) - copied from r62166, branches/SuSE-Code-11-SP1-Branch/instserver/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0