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

[yast-commit] r62166 - in /branches/SuSE-Code-11-SP1-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:18 2010 New Revision: 62166 URL: http://svn.opensuse.org/viewcvs/yast?rev=62166&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-SP1-Branch/instserver/ (props changed) branches/SuSE-Code-11-SP1-Branch/instserver/VERSION branches/SuSE-Code-11-SP1-Branch/instserver/package/yast2-instserver.changes branches/SuSE-Code-11-SP1-Branch/instserver/src/Instserver.ycp Modified: branches/SuSE-Code-11-SP1-Branch/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insts… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/instserver/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/instserver/VERSION Tue Jun 29 13:38:18 2010 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-SP1-Branch/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insts… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/instserver/package/yast2-instserver.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/instserver/package/yast2-instserver.changes Tue Jun 29 13:38:18 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-SP1-Branch/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insts… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/instserver/src/Instserver.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/instserver/src/Instserver.ycp Tue Jun 29 13:38:18 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] r62165 - /branches/tmp/jsrain/unattended-migration/
by jsrain＠svn.opensuse.org 29 Jun '10

29 Jun '10

Author: jsrain Date: Tue Jun 29 08:07:13 2010 New Revision: 62165 URL: http://svn.opensuse.org/viewcvs/yast?rev=62165&view=rev Log: Created a branch for unattended migration Added: branches/tmp/jsrain/unattended-migration/ (props changed) - copied from r62164, branches/SuSE-Code-11-SP1-Branch/ -- 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] r62164 - /tags/stable-2_21_57/gtk/
by rpmcruz＠svn.opensuse.org 28 Jun '10

28 Jun '10

Author: rpmcruz Date: Mon Jun 28 18:58:55 2010 New Revision: 62164 URL: http://svn.opensuse.org/viewcvs/yast?rev=62164&view=rev Log: Created tag stable-2_21_57 for gtk Added: tags/stable-2_21_57/gtk/ - copied from r62163, trunk/gtk/ -- 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] r62163 - /tags/stable-2_21_57/
by rpmcruz＠svn.opensuse.org 28 Jun '10

28 Jun '10

Author: rpmcruz Date: Mon Jun 28 18:58:48 2010 New Revision: 62163 URL: http://svn.opensuse.org/viewcvs/yast?rev=62163&view=rev Log: Created tag stable-2_21_57 Added: tags/stable-2_21_57/ -- 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-head-i586 #953
by Hudson Integration Service 28 Jun '10

28 Jun '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/953/changes> Changes: [Jiri Suchomel] skeleton module for Active Directory ------------------------------------------ [...truncated 4085 lines...] + cd www + mkdir -p /usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-0.i386/srv/www/yastws/vendor/plugins/time + cp -a COPYING README Rakefile app config doc init.rb install.rb tasks test uninstall.rb /usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-0.i386/srv/www/yastws/vendor/plugins/time + rm -f /usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-0.i386/srv/www/yastws/vendor/plugins/time/COPYING + mkdir -p /usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-0.i386/usr/share/PolicyKit/policy + RPM_BUILD_ROOT=/usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-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-time-ws-0.1.4-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.NSfEsw + 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}) -> 1.0928s -- initialize_schema_migrations_table() -> 0.4895s -- assume_migrated_upto_version(20090423142313, "db/migrate") -> 0.1486s Loaded suite /usr/bin/rake Started Finished in 6.9e-05 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/systemtime_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 ....... Finished in 0.256486 seconds. 7 tests, 18 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/systemtime_controller_test.rb" *** registering plugins *** Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ....... Finished in 0.349589 seconds. 7 tests, 8 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.4e-05 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications + exit 0 Processing files: webyast-time-ws-0.1.4-0.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.ZkLuAg + umask 022 + cd /usr/src/packages/BUILD + cd www + DOCDIR=/usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-0.i386/usr/share/doc/packages/webyast-time-ws + export DOCDIR + rm -rf /usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-0.i386/usr/share/doc/packages/webyast-time-ws + /bin/mkdir -p /usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-0.i386/usr/share/doc/packages/webyast-time-ws + cp -pr COPYING /usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-0.i386/usr/share/doc/packages/webyast-time-ws + exit 0 Finding Provides: /usr/lib/rpm/find-provides webyast-time-ws Finding Requires: /usr/lib/rpm/find-requires webyast-time-ws Finding Supplements: /usr/lib/rpm/find-supplements webyast-time-ws Provides: WebYaST(org.opensuse.yast.modules.yapi.time) yast2-webservice-time = 0.1.4 Requires(interp): /bin/sh Requires(rpmlib): rpmlib(VersionedDependencies) <= 3.0.3-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1 Requires(pre): yast2-webservice Requires(post): /bin/sh Requires(preun): yast2-webservice Obsoletes: yast2-webservice-time < 0.1.4 Processing files: webyast-time-ws-testsuite-0.1.4-0.noarch Finding Provides: /usr/lib/rpm/find-provides webyast-time-ws Finding Requires: /usr/lib/rpm/find-requires webyast-time-ws Finding Supplements: /usr/lib/rpm/find-supplements webyast-time-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-time-ws-0.1.4-0.i386 Wrote: /artifacts/webyast/rest-service/rpms/noarch/webyast-time-ws-0.1.4-0.noarch.rpm Wrote: /artifacts/webyast/rest-service/rpms/noarch/webyast-time-ws-testsuite-0.1.4-0.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.Ognxj4 + umask 022 + cd /usr/src/packages/BUILD + cd www + rm -rf /usr/src/packages/BUILDROOT/webyast-time-ws-0.1.4-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/activedirectory/package + pkgdir=./plugins/activedirectory ++ basename ./plugins/activedirectory + pkgname=activedirectory + destination=/artifacts/webyast/rest-service/package/yast2-webservice-activedirectory + mkdir -p /artifacts/webyast/rest-service/package/yast2-webservice-activedirectory + rm -rf '/artifacts/webyast/rest-service/package/yast2-webservice-activedirectory/*' + rm -rf ./plugins/activedirectory/package/www + cp -r ./plugins/activedirectory/package/ActiveDirectory.pm ./plugins/activedirectory/package/org.opensuse.yast.modules.yapi.activedirectory.policy ./plugins/activedirectory/package/webyast-activedirectory-ws.changes ./plugins/activedirectory/package/webyast-activedirectory-ws.spec ./plugins/activedirectory/package/www.tar.bz2 /artifacts/webyast/rest-service/package/yast2-webservice-activedirectory + pushd ./plugins/activedirectory/package /src/rest-service/plugins/activedirectory/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-activedirectory-ws.spec Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.6VL0jD + umask 022 + cd /usr/src/packages/BUILD + cd /usr/src/packages/BUILD + rm -rf www + /bin/tar -xf - + /usr/bin/bzip2 -dc /src/rest-service/plugins/activedirectory/package/www.tar.bz2 + STATUS=0 + '[' 0 -ne 0 ']' + cd www + /bin/chmod -Rf a+rX,u+w,g-w,o-w . + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.AbGhW9 + umask 022 + cd /usr/src/packages/BUILD + /bin/rm -rf /usr/src/packages/BUILDROOT/webyast-activedirectory-ws-0.1.0-0.i386 ++ dirname /usr/src/packages/BUILDROOT/webyast-activedirectory-ws-0.1.0-0.i386 + /bin/mkdir -p /usr/src/packages/BUILDROOT + /bin/mkdir /usr/src/packages/BUILDROOT/webyast-activedirectory-ws-0.1.0-0.i386 + cd www + mkdir -p public/activedirectory/restdoc + export RAILS_PARENT=/srv/www/yastws + RAILS_PARENT=/srv/www/yastws + env LANG=en rake restdoc 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) Skipping restdoc: restdoc/api.txt or public/**/restdoc/ not found. + rm -rf restdoc + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.JP0uUp + umask 022 + cd /usr/src/packages/BUILD + cd www + mkdir -p /usr/src/packages/BUILDROOT/webyast-activedirectory-ws-0.1.0-0.i386/srv/www/yastws/vendor/plugins/activedirectory + cp -a COPYING README Rakefile app config doc init.rb install.rb public test uninstall.rb /usr/src/packages/BUILDROOT/webyast-activedirectory-ws-0.1.0-0.i386/srv/www/yastws/vendor/plugins/activedirectory/ + rm -f /usr/src/packages/BUILDROOT/webyast-activedirectory-ws-0.1.0-0.i386/srv/www/yastws/vendor/plugins/activedirectory/COPYING + mkdir -p /usr/src/packages/BUILDROOT/webyast-activedirectory-ws-0.1.0-0.i386/usr/share/PolicyKit/policy + install -m 0644 /src/rest-service/plugins/activedirectory/package/org.opensuse.yast.modules.yapi.ad.policy /usr/src/packages/BUILDROOT/webyast-activedirectory-ws-0.1.0-0.i386/usr/share/PolicyKit/policy/ install: cannot stat `/src/rest-service/plugins/activedirectory/package/org.opensuse.yast.modules.yapi.ad.policy': No such file or directory error: Bad exit status from /var/tmp/rpm-tmp.JP0uUp (%install) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.JP0uUp (%install) + 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 Jiri Suchomel 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 4

[yast-commit] r62162 - /tags/stable-2_19_0/slp-server/
by mzugec＠svn.opensuse.org 28 Jun '10

28 Jun '10

Author: mzugec Date: Mon Jun 28 16:15:24 2010 New Revision: 62162 URL: http://svn.opensuse.org/viewcvs/yast?rev=62162&view=rev Log: Created tag stable-2_19_0 for slp-server Added: tags/stable-2_19_0/slp-server/ - copied from r62161, trunk/slp-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62161 - in /trunk/slp-server: VERSION agents/slp_conf.scr package/yast2-slp-server.changes src/SlpServer.ycp src/dialogs.ycp
by mzugec＠svn.opensuse.org 28 Jun '10

28 Jun '10

Author: mzugec Date: Mon Jun 28 16:15:17 2010 New Revision: 62161 URL: http://svn.opensuse.org/viewcvs/yast?rev=62161&view=rev Log: parse config file case sensitive Modified: trunk/slp-server/VERSION trunk/slp-server/agents/slp_conf.scr trunk/slp-server/package/yast2-slp-server.changes trunk/slp-server/src/SlpServer.ycp trunk/slp-server/src/dialogs.ycp Modified: trunk/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/VERSION?rev=62161&r1=… ============================================================================== --- trunk/slp-server/VERSION (original) +++ trunk/slp-server/VERSION Mon Jun 28 16:15:17 2010 @@ -1 +1 @@ -2.18.1 +2.19.0 Modified: trunk/slp-server/agents/slp_conf.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/agents/slp_conf.scr?r… ============================================================================== --- trunk/slp-server/agents/slp_conf.scr (original) +++ trunk/slp-server/agents/slp_conf.scr Mon Jun 28 16:15:17 2010 @@ -14,7 +14,7 @@ `ag_ini( `IniAgent( "/etc/slp.conf", $[ - "options" : [ "global_values", "comments_last", "ignore_case", "line_can_continue", "join_multiline" ], + "options" : [ "global_values", "comments_last", "line_can_continue", "join_multiline" ], "comments": [ "^[ \t]*$", // empty line "^[ \t]+[;#].*$", // comment char is not first char Modified: trunk/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/package/yast2-slp-ser… ============================================================================== --- trunk/slp-server/package/yast2-slp-server.changes (original) +++ trunk/slp-server/package/yast2-slp-server.changes Mon Jun 28 16:15:17 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 28 16:14:37 CEST 2010 - mzugec(a)suse.cz + +- parse config file case sensitive +- 2.19.0 + +------------------------------------------------------------------- Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/slp-server/src/SlpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/SlpServer.ycp?rev… ============================================================================== --- trunk/slp-server/src/SlpServer.ycp (original) +++ trunk/slp-server/src/SlpServer.ycp Mon Jun 28 16:15:17 2010 @@ -96,10 +96,10 @@ map <string, any> SETTINGS = $[]; global map<string, any> slp_config = $[ - "net.slp.usescopes":"DEFAULT", - "net.slp.isda":"false", - "net.slp.isbroadcastonly":"false", - "net.slp.daheartbeat":nil + "net.slp.useScopes":"DEFAULT", + "net.slp.isDA":"false", + "net.slp.isBroadcastOnly":"false", + "net.slp.DAHeartBeat":nil ]; @@ -114,7 +114,7 @@ foreach(string k1, any v1, SETTINGS, { if (k1 == "value") { foreach(map<string, any > v2, (list < map<string, any> >)v1, { - if (v2["type"]:nil == 1) slp_config[tolower(v2["name"]:"") ]=v2["value"]:""; + if (v2["type"]:nil == 1) slp_config[v2["name"]:""]=v2["value"]:""; }); } }); @@ -126,6 +126,7 @@ // write global configuration file /etc/slp.conf boolean WriteGlobalConfig(){ +/* list<string> correct_case2 = [ "net.slp.useScopes", "net.slp.DAAddresses", @@ -155,26 +156,20 @@ "net.slp.traceDrop", "net.slp.traceMsg" ]; +*/ foreach(string k1, any v1, slp_config, { SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:nil, { if (k1 == v2["name"]:"") { - if (v1 == nil) v2["type"]=0; - else { - foreach(string s, correct_case2, { - if (tolower(s)==k1){ - v2["name"] = s; - break; - } - }); - v2["type"]=1; - v2["value"]=v1; - } + v2["type"]= (v1 == nil) ? 0 : 1; + v2["value"]=v1; } return v2; }); }); +y2internal("slp_config %1", slp_config); + REGFILES["value"] = reg_files; y2milestone("write reg_files %1", reg_files); Modified: trunk/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/dialogs.ycp?rev=6… ============================================================================== --- trunk/slp-server/src/dialogs.ycp (original) +++ trunk/slp-server/src/dialogs.ycp Mon Jun 28 16:15:17 2010 @@ -240,33 +240,33 @@ define map getServerOptions() ``{ return $[ - "net.slp.usescopes":$[], - "net.slp.daaddresses":$[], - "net.slp.isda":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.daheartbeat":$[], - "net.slp.watchregistrationpid":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.maxresults":$[], - "net.slp.isbroadcastonly":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.passivedadetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.activedadetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.daactivediscoveryinterval":$[], - "net.slp.multicastttl":$[], - "net.slp.dadiscoverymaximumwait":$[], - "net.slp.dadiscoverytimeouts":$[], - "net.slp.multicastmaximumwait":$[], - "net.slp.multicasttimeouts":$[], - "net.slp.unicastmaximumwait":$[], - "net.slp.unicasttimeouts":$[], - "net.slp.datagramtimeouts":$[], - "net.slp.randomWaitbound":$[], - "net.slp.mtu":$[], + "net.slp.useScopes":$[], + "net.slp.DAAddresses":$[], + "net.slp.isDA":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.DAHeartBeat":$[], + "net.slp.watchRegistrationPID":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.maxResults":$[], + "net.slp.isBroadcastOnly":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.passiveDADetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.activeDADetection":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.DAActiveDiscoveryInterval":$[], + "net.slp.multicastTTL":$[], + "net.slp.DADiscoveryMaximumWait":$[], + "net.slp.DADiscoveryTimeouts":$[], + "net.slp.multicastMaximumWait":$[], + "net.slp.multicastTimeouts":$[], + "net.slp.unicastMaximumWait":$[], + "net.slp.unicastTimeouts":$[], + "net.slp.datagramTimeouts":$[], + "net.slp.randomWaitBound":$[], + "net.slp.MTU":$[], "net.slp.interfaces":$[], - "net.slp.securityenabled":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.checksourceaddr":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracedatraffic":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracereg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracedrop":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], - "net.slp.tracemsg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]] + "net.slp.securityEnabled":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.checkSourceAddr":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceDATraffic":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceReg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceDrop":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]], + "net.slp.traceMsg":$["popup":$["items":[["true"], ["false"]], "widget":`combobox]] ]; } @@ -523,24 +523,24 @@ case(`bc) : y2milestone("Use broadcast"); UI::ChangeWidget(`id(`ip), `Enabled, false); UI::ChangeWidget(`id(`scope), `Enabled, false); - SlpServer::slp_config["net.slp.isda"]="false"; - SlpServer::slp_config["net.slp.isbroadcastonly"]="true"; + SlpServer::slp_config["net.slp.isDA"]="false"; + SlpServer::slp_config["net.slp.isBroadcastOnly"]="true"; break; case(`mc) : y2milestone("Use multicast"); UI::ChangeWidget(`id(`ip), `Enabled, false); UI::ChangeWidget(`id(`scope), `Enabled, true); - SlpServer::slp_config["net.slp.isda"]="false"; - SlpServer::slp_config["net.slp.isbroadcastonly"]="false"; + SlpServer::slp_config["net.slp.isDA"]="false"; + SlpServer::slp_config["net.slp.isBroadcastOnly"]="false"; break; case(`da) : y2milestone("Use DA Server"); UI::ChangeWidget(`id(`ip), `Enabled, true); UI::ChangeWidget(`id(`scope), `Enabled, true); - SlpServer::slp_config["net.slp.isda"]="false"; + SlpServer::slp_config["net.slp.isDA"]="false"; break; case(`da_server) : y2milestone("Becomes DA Server"); UI::ChangeWidget(`id(`ip), `Enabled, false); // UI::ChangeWidget(`id(`scope), `Enabled, false); - SlpServer::slp_config["net.slp.isda"]="true"; + SlpServer::slp_config["net.slp.isDA"]="true"; break; } @@ -550,13 +550,13 @@ define void initServerSettings(string key) ``{ symbol mode = nil; keys = []; - UI::ChangeWidget(`id(`ip), `Value, String::CutBlanks( SlpServer::slp_config["net.slp.daaddresses"]:"") ); - UI::ChangeWidget(`id(`scope), `Value, SlpServer::slp_config["net.slp.usescopes"]:""); - if (SlpServer::slp_config["net.slp.isda"]:"false" == "true") mode = `da_server; + UI::ChangeWidget(`id(`ip), `Value, String::CutBlanks( SlpServer::slp_config["net.slp.DAAddresses"]:"") ); + UI::ChangeWidget(`id(`scope), `Value, SlpServer::slp_config["net.slp.useScopes"]:""); + if (SlpServer::slp_config["net.slp.isDA"]:"false" == "true") mode = `da_server; else - if (SlpServer::slp_config["net.slp.isbroadcastonly"]:"false" == "true") mode = `bc; + if (SlpServer::slp_config["net.slp.isBroadcastOnly"]:"false" == "true") mode = `bc; else - if (size(deletechars(SlpServer::slp_config["net.slp.daaddresses"]:"", " "))>0) mode = `da; + if (size(deletechars(SlpServer::slp_config["net.slp.DAAddresses"]:"", " "))>0) mode = `da; else mode = `mc; UI::ChangeWidget(`id(`resp), `CurrentButton, mode); changeResponseTo(mode); @@ -571,8 +571,8 @@ } void storeServerSettings(string option_id, map option_map) ``{ - SlpServer::slp_config["net.slp.usescopes"]=UI::QueryWidget(`id(`scope), `Value); - SlpServer::slp_config["net.slp.daaddresses"]=UI::QueryWidget(`id(`ip), `Value); + SlpServer::slp_config["net.slp.useScopes"]=UI::QueryWidget(`id(`scope), `Value); + SlpServer::slp_config["net.slp.DAAddresses"]=UI::QueryWidget(`id(`ip), `Value); }; define boolean validateServerSettings (string key, map event) -- 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] r62160 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 25 Jun '10

25 Jun '10

Author: rpmcruz Date: Fri Jun 25 16:39:08 2010 New Revision: 62160 URL: http://svn.opensuse.org/viewcvs/yast?rev=62160&view=rev Log: Build preparation. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62160&r1=62159&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Jun 25 16:39:08 2010 @@ -1 +1 @@ -2.21.56 +2.21.57 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62160&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Jun 25 16:39:08 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "56") +SET(VERSION_PATCH "57") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Jun 25 16:39:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 26 15:37:00 WET 2010 - badshah400(a)gmail.com + +- 2.21.57 +- don't steal window focus (bnc#615927) + +------------------------------------------------------------------- Sun Jun 13 10:28:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.56 -- 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] r62159 - in /trunk/gtk: ChangeLog src/YGDialog.cc
by rpmcruz＠svn.opensuse.org 25 Jun '10

25 Jun '10

Author: rpmcruz Date: Fri Jun 25 16:35:03 2010 New Revision: 62159 URL: http://svn.opensuse.org/viewcvs/yast?rev=62159&view=rev Log: Compile fix. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62159&r1=62158… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Jun 25 16:35:03 2010 @@ -1,3 +1,7 @@ +2010-06-25 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGDialog.cc: compile fix. + 2010-06-22 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGDialog.cc: bug fix 615927: don't steal focus Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=62159&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Fri Jun 25 16:35:03 2010 @@ -267,7 +267,7 @@ } static gboolean focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event) - { gtk_window_set_urgency_hint (GTK_WINDOW (widget), FALSE); } + { gtk_window_set_urgency_hint (GTK_WINDOW (widget), FALSE); return FALSE; } static void realize_cb (GtkWidget *widget, YGWindow *pThis) { pThis->busyCursor(); } -- 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-head-i586 #948
by Hudson Integration Service 25 Jun '10

25 Jun '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/948/changes> Changes: [Stefan Schubert] fixed for ActiveRecord ------------------------------------------ [...truncated 632 lines...] 5) Failure: test_catch_invalid(RaisingControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/raising_controller_test.rb:77:in `test_catch_invalid' 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']: Expected response to be a <422>, but was <503> <""> 6) Failure: test_no_permission(RaisingControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/raising_controller_test.rb:98:in `test_no_permission' 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']: Expected response to be a <403>, but was <503> <""> 7) Failure: test_resources_access_root(ResourcesControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/resources_controller_test.rb:50:in `test_resources_access_root' 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']: Expected response to be a <:success>, but was <503> <""> 8) Failure: test_resources_by_interfaces_query(ResourcesControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/resources_controller_test.rb:78:in `test_resources_by_interfaces_query' /test/functional/resources_controller_test.rb:76:in `each' /test/functional/resources_controller_test.rb:76:in `test_resources_by_interfaces_query' 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']: Expected response to be a <:success>, but was <503> <""> 9) Failure: test_resources_output_html_format(ResourcesControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/resources_controller_test.rb:71:in `test_resources_output_html_format' 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']: Expected response to be a <:success>, but was <503> <""> 10) Failure: test_resources_output_xml_format(ResourcesControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/resources_controller_test.rb:65:in `test_resources_output_xml_format' 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']: Expected response to be a <:success>, but was <503> <""> 11) Failure: test_resources_show_with_interface(ResourcesControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/resources_controller_test.rb:55:in `test_resources_show_with_interface' 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']: Expected response to be a <:success>, but was <503> <""> 12) Failure: test_resources_show_with_unknown_interface(ResourcesControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/resources_controller_test.rb:60:in `test_resources_show_with_unknown_interface' 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']: Expected response to be a <:missing>, but was <503> <""> 13) Failure: test_empty_index(RestdocControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/restdoc_controller_test.rb:47:in `test_empty_index' 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']: Expected response to be a <:success>, but was <503> <""> 14) Failure: test_index(RestdocControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/restdoc_controller_test.rb:39:in `test_index' 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']: Expected response to be a <:success>, but was <503> <""> 15) Failure: test_output_html_format(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:90:in `test_output_html_format' 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']: Expected response to be a <:success>, but was <503> <""> 16) Failure: test_output_xml_format(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:84:in `test_output_xml_format' 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']: Expected response to be a <:success>, but was <503> <""> 17) Failure: test_sessions_create(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:46:in `test_sessions_create' 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']: Expected response to be a <:success>, but was <503> <""> 18) Failure: test_sessions_create_fail_with_brute_force_protection(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:67:in `test_sessions_create_fail_with_brute_force_protection' 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']: Expected response to be a <:success>, but was <503> <""> 19) Failure: test_sessions_create_fail_with_login_and_password(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:61:in `test_sessions_create_fail_with_login_and_password' 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']: Expected response to be a <:success>, but was <503> <""> 20) Failure: test_sessions_create_remember_me(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:74:in `test_sessions_create_remember_me' 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']: Expected response to be a <:success>, but was <503> <""> 21) Failure: test_sessions_create_with_hash(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:51:in `test_sessions_create_with_hash' 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']: Expected response to be a <:success>, but was <503> <""> 22) Failure: test_sessions_create_with_login_and_password(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:56:in `test_sessions_create_with_login_and_password' 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']: Expected response to be a <:success>, but was <503> <""> 23) Failure: test_sessions_destroy(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:79:in `test_sessions_destroy' 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']: Expected response to be a <:success>, but was <503> <""> 24) Failure: test_sessions_new(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:36:in `test_sessions_new' 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']: Expected response to be a <302>, but was <503> <""> 25) Failure: test_sessions_show(SessionsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/sessions_controller_test.rb:41:in `test_sessions_show' 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']: Expected response to be a <:success>, but was <503> <""> 26) Failure: test_index(VendorSettingsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/vendor_settings_controller_test.rb:30:in `test_index' 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']: Expected response to be a <:success>, but was <503> <""> 27) Failure: test_show(VendorSettingsControllerTest) [actionpack (2.3.8) lib/action_controller/test_case.rb:119:in `clean_backtrace' /test/functional/vendor_settings_controller_test.rb:37:in `test_show' 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']: Expected response to be a <:success>, but was <503> <""> 53 tests, 78 assertions, 27 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:functionals! 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 2

[yast-commit] r62158 - /tags/stable-2_19_15/storage/
by aschnell＠svn.opensuse.org 25 Jun '10

25 Jun '10

Author: aschnell Date: Fri Jun 25 14:23:25 2010 New Revision: 62158 URL: http://svn.opensuse.org/viewcvs/yast?rev=62158&view=rev Log: Created tag stable-2_19_15 for storage Added: tags/stable-2_19_15/storage/ (props changed) - copied from r62157, trunk/storage/ -- 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] r62157 - in /trunk/storage: VERSION package/yast2-storage.changes
by aschnell＠svn.opensuse.org 25 Jun '10

25 Jun '10

Author: aschnell Date: Fri Jun 25 14:21:29 2010 New Revision: 62157 URL: http://svn.opensuse.org/viewcvs/yast?rev=62157&view=rev Log: - increased version Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=62157&r1=621… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Jun 25 14:21:29 2010 @@ -1 +1 @@ -2.19.14 +2.19.15 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Jun 25 14:21:29 2010 @@ -2,6 +2,7 @@ Mon Jun 21 16:42:34 CEST 2010 - aschnell(a)suse.de - avoid unreadable buttons (bnc #615377) +- 2.19.15 ------------------------------------------------------------------- Mon May 17 18:54:36 CEST 2010 - fehr(a)suse.de -- 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] r62156 - /tags/stable-2_19_17/country/
by jsuchome＠svn.opensuse.org 25 Jun '10

25 Jun '10

Author: jsuchome Date: Fri Jun 25 10:57:20 2010 New Revision: 62156 URL: http://svn.opensuse.org/viewcvs/yast?rev=62156&view=rev Log: Created tag stable-2_19_17 for country Added: tags/stable-2_19_17/country/ - copied from r62155, trunk/country/ -- 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] r62155 - in /trunk/country: VERSION console/src/Console.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 25 Jun '10

25 Jun '10

Author: jsuchome Date: Fri Jun 25 10:56:48 2010 New Revision: 62155 URL: http://svn.opensuse.org/viewcvs/yast?rev=62155&view=rev Log: - Console.ycp: correct parsing of the kernel line (bnc#604699) - 2.19.17 Modified: trunk/country/VERSION trunk/country/console/src/Console.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=62155&r1=621… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Fri Jun 25 10:56:48 2010 @@ -1 +1 @@ -2.19.16 +2.19.17 Modified: trunk/country/console/src/Console.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/console/src/Console.ycp?… ============================================================================== --- trunk/country/console/src/Console.ycp (original) +++ trunk/country/console/src/Console.ycp Fri Jun 25 10:56:48 2010 @@ -140,14 +140,15 @@ SCR::Execute (.target.bash,"sed -i '/^\$hvc\\|hvsi\\|S[0-9]\$/s@^.*@#&@' /etc/inittab"); // find out if the baud rate is not present on command line (bnc#602743) - string rate = "42"; + integer rate = 42; foreach (string part, splitstring (Kernel::GetCmdLine (), "\t "), { if (substring (part, 0, 11) == "console=tty" && issubstring (part, ",")) { - rate = splitstring (part, ",")[1]:rate; + string srate = splitstring (part, ",")[1]:"42"; + rate = tointeger (srate); // "bbbbpnf" -> bbbb, where 'b' is number and 'p' character } }); - + if (rate == nil) rate = 42; SCR::Execute (.target.bash, sformat ("grep -E '^cons:' /etc/inittab || /bin/echo 'cons:12345:respawn:/sbin/smart_agetty -L %1 console' >> /etc/inittab", rate)); SCR::Execute (.target.bash,"grep -Ew ^console /etc/securetty || /bin/echo console >> /etc/securetty"); } Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Jun 25 10:56:48 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 25 10:47:20 CEST 2010 - jsuchome(a)suse.cz + +- Console.ycp: correct parsing of the kernel line (bnc#604699) +- 2.19.17 + +------------------------------------------------------------------- Thu May 27 08:28:48 CEST 2010 - jsuchome(a)suse.cz - use Dutch keyboard layout as a default for Dutch (bnc#603955) -- 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-head-i586 #903
by Hudson Integration Service 24 Jun '10

24 Jun '10

See <http://yast.suse.de:3334/job/webyast-service-head-i586/903/changes> Changes: [Stefan Schubert] enabled translation ------------------------------------------ Started by an SCM change Checkout [workspace] $ git fetch Checking out origin/master [workspace] $ git checkout -f origin/master Previous HEAD position was cb9428d... fix require in dbus service HEAD is now at af46183... enabled translation [workspace] $ git rev-parse origin/master [workspace] $ git log --numstat -M --summary --pretty=raw cb9428de2144acbb9d2b48f330a6900d38f67bba..af46183d3e639b0b3a567ef8aabebf3cd5411e67 [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/hudson3157524549269104576.sh + sudo -E /data/hudson/bin/build-chroot.sh webyast rest-service head-i586 SCRIPT ID: I am /data/hudson/bin/build-chroot.sh at <http://yast.suse.de:3334/job/webyast-service-head-i586/ws/> ..copying source code <http://yast.suse.de:3334/job/webyast-service-head-i586/ws/*> /data/hudson/HUDSON-CHROOT/webyast-head-i586/src/rest-service ..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-rest-service webyast-rest-service + case "${MODULE}" in + SUBDIR=webservice + cd /src/rest-service + echo /src/rest-service /src/rest-service + ls INSTALL Makefile README Rakefile doc http_accept_language index.html.template plugins policy-tools rpam webservice webservice-tasks + [[ rest-service == \r\e\s\t\-\s\e\r\v\i\c\e ]] + echo 'start dbus..' start dbus.. + /etc/init.d/dbus start Starting D-Bus daemon..done + echo 'Running as root' Running as root + case "${MODULE}" in + echo 'Creating shared tasks gem' Creating shared tasks gem + pushd webservice-tasks /src/rest-service/webservice-tasks /src/rest-service + rake package-local gem build webyast-rake-tasks.gemspec (in /src/rest-service/webservice-tasks) Updating webyast-rake-tasks.gemspec (0.1.7)... Updating package/rubygem-webyast-rake-tasks.spec (0.1.7)... WARNING: no description specified WARNING: no rubyforge_project specified Successfully built RubyGem Name: webyast-rake-tasks Version: 0.1.7 File: webyast-rake-tasks-0.1.7.gem cp webyast-rake-tasks-0.1.7.gem package + echo 'Installing gem...' Installing gem... + gem install webyast-rake-tasks-0.1.7.gem ERROR: http://rubygems.org/ does not appear to be a repository Successfully installed webyast-rake-tasks-0.1.7 1 gem installed Installing ri documentation for webyast-rake-tasks-0.1.7... Installing RDoc documentation for webyast-rake-tasks-0.1.7... + popd /src/rest-service + sudo rake install_policies (in /src/rest-service) 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/rest-service/webservice) rake aborted! Error on execute '/usr/bin/rake install_policies' inside webservice/ /src/rest-service/Rakefile:41 (See full trace by running task with --trace) + echo 'failed to install policies' failed to install policies + echo 1 1 + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + cat + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + pushd webservice /src/rest-service/webservice /src/rest-service + ruby package/grantwebyastrights --user root --action grant + check_exit 0 + '[' -z 0 ']' + MYEXIT=0 + '[' 0 == 0 ']' + echo 'exit code: 0 ... good, lets continue' exit code: 0 ... good, lets continue + return + SYSTEM_CHECK_NON_STRICT=1 + rake system_check 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/rest-service/webservice) ++ 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 44

[yast-commit] r62154 - /trunk/ntp-client/src/ntp-client_proposal.ycp
by varkoly＠svn.opensuse.org 24 Jun '10

24 Jun '10

Author: varkoly Date: Thu Jun 24 07:58:54 2010 New Revision: 62154 URL: http://svn.opensuse.org/viewcvs/yast?rev=62154&view=rev Log: bnc#598856 - empty NTP server list on time setup Modified: trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_propos… ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Thu Jun 24 07:58:54 2010 @@ -42,6 +42,7 @@ param = (map)WFM::Args(1); } +y2milestone("ntp-client_proposal called func %1 param %2",func,param); string ui_help_text() { // help text @@ -128,6 +129,7 @@ if( NtpClient::config_has_been_read || NtpClient::ntp_selected) { + y2milestone("ntp_items will be filled from /etc/ntp.conf"); // grr, GUNS means all of them are used and here we just pick one ntp_items = maplist(string server, NtpClient::GetUsedNtpServers(),{ return `item(`id(server), server); @@ -140,7 +142,7 @@ would it have sense if implemented properly? real proposal starts here, it is ui_read before... */ - + y2milestone("ntp_items :%1", ntp_items); if( ntp_items == []) { y2milestone("Nothing found in /etc/ntp.conf, proposing current language-based NTP server list"); @@ -172,7 +174,7 @@ `HBox ( `HSpacing (0.5), // check box label - `Left (`CheckBox (`id (`ntp_save), _("&Save NTP Configuration"))) + `Left (`CheckBox (`id (`ntp_save), _("&Save NTP Configuration"), true )) ) )), `HWeight (1, `VBox ( @@ -203,13 +205,7 @@ boolean ntp_used = (first_time && !Stage::initial ()) ? GetNTPEnabled () : NtpClient::ntp_selected; - if (first_time) - // ntp_used with first_time means that ntp service is enabled - UI::ChangeWidget (`id(`ntp_save), `Value, ntp_used); - - // ntp_was_used = ntp_used; - if (ntp_used) - MakeProposal (country); + MakeProposal (country); return ntp_used; } -- 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] r62153 - in /trunk/printer: VERSION package/yast2-printer.changes tools/autodetect_print_queues
by jsmeix＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: jsmeix Date: Wed Jun 23 16:07:03 2010 New Revision: 62153 URL: http://svn.opensuse.org/viewcvs/yast?rev=62153&view=rev Log: - In autodetect_print_queues replace each " character by \" in the YCP output for the print queue description and location strings (see Novell/Suse Bugzilla bnc#616687). - 2.19.13 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/tools/autodetect_print_queues Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=62153&r1=621… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Jun 23 16:07:03 2010 @@ -1 +1 @@ -2.19.12 +2.19.13 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Jun 23 16:07:03 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jun 23 15:59:44 CEST 2010 - jsmeix(a)suse.de + +- In autodetect_print_queues replace each " character by \" in + the YCP output for the print queue description and location + strings (see Novell/Suse Bugzilla bnc#616687). +- 2.19.13 + +------------------------------------------------------------------- Wed Jun 2 16:02:09 CEST 2010 - jsmeix(a)suse.de - In Printer.ycp and helps.ycp fixed the text strings therein Modified: trunk/printer/tools/autodetect_print_queues URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_print_q… ============================================================================== --- trunk/printer/tools/autodetect_print_queues (original) +++ trunk/printer/tools/autodetect_print_queues Wed Jun 23 16:07:03 2010 @@ -149,8 +149,8 @@ do case "$KEY" in queue) Output QUEUE="$VALUE" - DESCRIPTION=$( sed -n -e "/printer $QUEUE /,/On fault:/{s/^[[:space:]]*Description: //p}" $TMP_DATA_RAW_L ) - LOCATION=$( sed -n -e "/printer $QUEUE /,/On fault:/{s/^[[:space:]]*Location: //p}" $TMP_DATA_RAW_L ) + DESCRIPTION=$( sed -n -e "/printer $QUEUE /,/On fault:/{s/^[[:space:]]*Description: //p}" $TMP_DATA_RAW_L | sed -e 's/"/\\"/g' ) + LOCATION=$( sed -n -e "/printer $QUEUE /,/On fault:/{s/^[[:space:]]*Location: //p}" $TMP_DATA_RAW_L | sed -e 's/"/\\"/g' ) PPD=$( sed -n -e "/printer $QUEUE /,/On fault:/{s/^[[:space:]]*Interface: //p}" $TMP_DATA_RAW_L ) [ "${PPD##*.}" != "ppd" ] && PPD="" DISABLED=$( grep -q "^printer $QUEUE disabled" $TMP_DATA_RAW_L && echo "yes" || echo "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] r62152 - in /trunk/ldap-server/src: dialogs.ycp helps.ycp
by rhafer＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: rhafer Date: Wed Jun 23 13:49:49 2010 New Revision: 62152 URL: http://svn.opensuse.org/viewcvs/yast?rev=62152&view=rev Log: Less verbose widget labels (bnc#587475) Modified: trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/helps.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Jun 23 13:49:49 2010 @@ -282,33 +282,37 @@ term serverTypeWidget = `HSquash( `VBox( - `Heading( _("Please select Server type") ), - `VSpacing(), - `RadioButtonGroup( - `id( `rbg_servertype ), + `Heading( _("Server type") ), + `Frame("", `VBox( - `Left( - `RadioButton( - `id( `rb_standalone ), - _("This will be a standalone server"), - true - ) - ), `VSpacing(), - `Left( - `RadioButton( - `id( `rb_master ), - _("This server can act as a master server in a replication setup"), - false - ) - ), - `VSpacing(), - `Left( - `RadioButton( - `id( `rb_slave ), - _("This will be a replica (slave) server.\n") + - _("All data including configuration will replicated from a remote server."), - false + `RadioButtonGroup( + `id( `rbg_servertype ), + `VBox( + `Left( + `RadioButton( + `id( `rb_standalone ), + _("Stand-alone server"), + true + ) + ), + `VSpacing(), + `Left( + `RadioButton( + `id( `rb_master ), + _("Master server in a replication setup"), + false + ) + ), + `VSpacing(), + `Left( + `RadioButton( + `id( `rb_slave ), + _("Replica (slave) server.\n") + + _("All data, including configuration, is replicated from a remote server."), + false + ) + ) ) ) ) Modified: trunk/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/helps.ycp?rev=62… ============================================================================== --- trunk/ldap-server/src/helps.ycp (original) +++ trunk/ldap-server/src/helps.ycp Wed Jun 23 13:49:49 2010 @@ -218,11 +218,11 @@ /* Configuration Wizard Step 2 */ "server_type" : _("Select the type of LDAP Server you want to setup. The following scenarios are available:") + - _("Standalone Server: Setup a single standalone OpenLDAP Server with no preparations for + _("Stand-alone server: Setup a single standalone OpenLDAP Server with no preparations for replication") + - _("Replication Master (Provider): Create an OpenLDAP setup that is prepared to act as a master server + _("Master server in a replication setup: Create an OpenLDAP setup that is prepared to act as a master server (provider) in a replication setup.") + - _("Replication Slave (Consumer): Setup an OpenLDAP slave server that replicates all its data, + _("Replica slave server: Setup an OpenLDAP slave server that replicates all its data, including configuration, from a master server."), /* Configuration Wizard Step 3 */ -- 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] r62151 - in /trunk/ldap-server/src: LdapDatabase.ycp widgets.ycp
by rhafer＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: rhafer Date: Wed Jun 23 13:37:15 2010 New Revision: 62151 URL: http://svn.opensuse.org/viewcvs/yast?rev=62151&view=rev Log: - Alignment Issues (bnc#421040) - Use standard labels for Add/Delete database Buttons Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Wed Jun 23 13:37:15 2010 @@ -855,10 +855,12 @@ `PushButton( `id (`pb_down ), _("Down") ) ) ), - `HBox( - `PushButton( `id (`pb_add ), _("Add") ), - `PushButton( `id (`pb_del ), _("Delete") ), - `PushButton( `id (`pb_edit ), _("Edit") ) + `Left( + `HBox( + `PushButton( `id (`pb_add ), Label::AddButton() ), + `PushButton( `id (`pb_edit ), Label::EditButton() ), + `PushButton( `id (`pb_del ), Label::DeleteButton() ) + ) ) ) ), @@ -1147,10 +1149,12 @@ `PushButton( `id (`pb_down ), _("Down") ) ) ), - `HBox( - `PushButton( `id (`pb_add ), _("Add") ), - `PushButton( `id (`pb_del ), _("Delete") ), - `PushButton( `id (`pb_edit ), _("Edit") ) + `Left( + `HBox( + `PushButton( `id (`pb_add ), Label::AddButton() ), + `PushButton( `id (`pb_edit ),Label::EditButton() ), + `PushButton( `id (`pb_del ), Label::DeleteButton() ) + ) ) ) ); Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Wed Jun 23 13:37:15 2010 @@ -301,11 +301,13 @@ `header( _("Attrbute"), _("Presence"), _("Equality"), _("Substring")), [ ] ), - `HSquash( - `HBox( - `PushButton( `id( `pb_idx_add ), _("Add") ), - `PushButton( `id( `pb_idx_edit ), _("Edit") ), - `PushButton( `id( `pb_idx_del ), _("Delete") ) + `Left( + `HSquash( + `HBox( + `PushButton( `id( `pb_idx_add ), Label::AddButton() ), + `PushButton( `id( `pb_idx_edit ), Label::EditButton() ), + `PushButton( `id( `pb_idx_del ), Label::DeleteButton() ) + ) ) ) ); -- 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] r62150 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: rhafer Date: Wed Jun 23 13:23:58 2010 New Revision: 62150 URL: http://svn.opensuse.org/viewcvs/yast?rev=62150&view=rev Log: - Alignment Issues (bnc#421040) - Use standard labels for Add/Delete database Buttons Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Wed Jun 23 13:23:58 2010 @@ -1192,9 +1192,11 @@ `MinSize( 60, 7, `Table( `id( `tab_db ),`opt(`keepSorting), `header(_("Suffix DN"), _("Database type") ) ) ), - `HBox( - `PushButton( `id( `pb_add ), _("A&dd Database...") ), - `PushButton( `id( `pb_del ), _("Delete Database") ) + `Left( + `HBox( + `PushButton( `id( `pb_add ), Label::AddButton() ), + `PushButton( `id( `pb_del ), Label::DeleteButton() ) + ) ) ), "cb_read" : ``( cb_read_databases() ), -- 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] r62149 - /tags/branch-Code-11-SP1-2_17_22/ldap-client/
by jsuchome＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: jsuchome Date: Wed Jun 23 13:23:06 2010 New Revision: 62149 URL: http://svn.opensuse.org/viewcvs/yast?rev=62149&view=rev Log: Created tag branch-Code-11-SP1-2_17_22 for ldap-client Added: tags/branch-Code-11-SP1-2_17_22/ldap-client/ (props changed) - copied from r62148, branches/SuSE-Code-11-SP1-Branch/ldap-client/ -- 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] r62148 - /tags/stable-2_19_2/ldap-client/
by jsuchome＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: jsuchome Date: Wed Jun 23 13:23:04 2010 New Revision: 62148 URL: http://svn.opensuse.org/viewcvs/yast?rev=62148&view=rev Log: Created tag stable-2_19_2 for ldap-client Added: tags/stable-2_19_2/ldap-client/ - copied from r62146, trunk/ldap-client/ -- 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] r62147 - /tags/branch-Code-11-SP1-2_17_22/
by jsuchome＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: jsuchome Date: Wed Jun 23 13:23:03 2010 New Revision: 62147 URL: http://svn.opensuse.org/viewcvs/yast?rev=62147&view=rev Log: Created tag branch-Code-11-SP1-2_17_22 Added: tags/branch-Code-11-SP1-2_17_22/ -- 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] r62146 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp testsuite/tests/Export.out testsuite/tests/Export.ycp
by jsuchome＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: jsuchome Date: Wed Jun 23 13:22:59 2010 New Revision: 62146 URL: http://svn.opensuse.org/viewcvs/yast?rev=62146&view=rev Log: - include "Create Home Directory on Login" option in Import/Export (bnc#616303) - 2.19.2 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/testsuite/tests/Export.out trunk/ldap-client/testsuite/tests/Export.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=62146&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Jun 23 13:22:59 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Jun 23 13:22:59 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 23 13:22:18 CEST 2010 - jsuchome(a)suse.cz + +- include "Create Home Directory on Login" option in Import/Export + (bnc#616303) +- 2.19.2 + +------------------------------------------------------------------- Tue Apr 20 08:42:15 CEST 2010 - jsuchome(a)suse.cz - added UI for downloading CA certificates, enable editing of Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=621… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Jun 23 13:22:59 2010 @@ -399,6 +399,7 @@ tls_cacertdir = settings ["tls_cacertdir"]:""; tls_cacertfile = settings ["tls_cacertfile"]:""; tls_checkpeer = settings ["tls_checkpeer"]:"yes"; + mkhomedir = settings ["mkhomedir"]:mkhomedir; if (_start_autofs) required_packages = (list<string>) union (required_packages, ["autofs"]); @@ -439,7 +440,8 @@ "pam_password" : pam_password, "member_attribute" : member_attribute, "create_ldap" : create_ldap, - "login_enabled" : login_enabled + "login_enabled" : login_enabled, + "mkhomedir" : mkhomedir ]; if (tls_checkpeer != "yes") e["tls_checkpeer"] = tls_checkpeer; Modified: trunk/ldap-client/testsuite/tests/Export.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.out (original) +++ trunk/ldap-client/testsuite/tests/Export.out Wed Jun 23 13:22:59 2010 @@ -18,4 +18,4 @@ Read .passwd.passwd.pluslines ["+"] Return true Dump ============================================ -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/Export.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.ycp (original) +++ trunk/ldap-client/testsuite/tests/Export.ycp Wed Jun 23 13:22:59 2010 @@ -78,7 +78,8 @@ "target": $[ "bash": 0, "bash_output": $[ - "stdout" : "", + // for Pam::Enabled ("mkhomedir") call + "stdout" : "something:", ] ], "passwd": $[ -- 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] r62145 - in /branches/SuSE-Code-11-SP1-Branch/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp testsuite/tests/Export.out testsuite/tests/Export.ycp
by jsuchome＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: jsuchome Date: Wed Jun 23 13:22:51 2010 New Revision: 62145 URL: http://svn.opensuse.org/viewcvs/yast?rev=62145&view=rev Log: - include "Create Home Directory on Login" option in Import/Export (bnc#616303) - 2.17.22 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-client/VERSION branches/SuSE-Code-11-SP1-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-Code-11-SP1-Branch/ldap-client/src/Ldap.ycp branches/SuSE-Code-11-SP1-Branch/ldap-client/testsuite/tests/Export.out branches/SuSE-Code-11-SP1-Branch/ldap-client/testsuite/tests/Export.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-client/VERSION Wed Jun 23 13:22:51 2010 @@ -1 +1 @@ -2.17.21 +2.17.22 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-client/package/yast2-ldap-client.changes Wed Jun 23 13:22:51 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 23 12:45:32 CEST 2010 - jsuchome(a)suse.cz + +- include "Create Home Directory on Login" option in Import/Export + (bnc#616303) +- 2.17.22 + +------------------------------------------------------------------- Mon Jun 8 14:45:51 CEST 2009 - jsuchome(a)suse.cz - fixed handling of uniqueMember option (bnc#509874) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-client/src/Ldap.ycp Wed Jun 23 13:22:51 2010 @@ -423,6 +423,7 @@ create_ldap = settings ["create_ldap"]:false; login_enabled = settings ["login_enabled"]:true; _start_autofs = settings ["start_autofs"]:false; + mkhomedir = settings ["mkhomedir"]:mkhomedir; if (_start_autofs) required_packages = (list<string>) union (required_packages, ["autofs"]); @@ -463,7 +464,8 @@ "pam_password" : pam_password, "member_attribute" : member_attribute, "create_ldap" : create_ldap, - "login_enabled" : login_enabled + "login_enabled" : login_enabled, + "mkhomedir" : mkhomedir ]; if (nss_base_passwd != base_dn) e["nss_base_passwd"] = nss_base_passwd; Modified: branches/SuSE-Code-11-SP1-Branch/ldap-client/testsuite/tests/Export.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-client/testsuite/tests/Export.out (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-client/testsuite/tests/Export.out Wed Jun 23 13:22:51 2010 @@ -15,4 +15,4 @@ Read .passwd.passwd.pluslines ["+"] Return true Dump ============================================ -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "start_autofs":false, "start_ldap":true] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "start_autofs":false, "start_ldap":true] Modified: branches/SuSE-Code-11-SP1-Branch/ldap-client/testsuite/tests/Export.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-client/testsuite/tests/Export.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-client/testsuite/tests/Export.ycp Wed Jun 23 13:22:51 2010 @@ -75,7 +75,8 @@ "target": $[ "bash": 0, "bash_output": $[ - "stdout" : "", + // for Pam::Enabled ("mkhomedir") call + "stdout" : "something:", ] ], "passwd": $[ -- 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] r62144 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: coolo Date: Wed Jun 23 10:13:32 2010 New Revision: 62144 URL: http://svn.opensuse.org/viewcvs/yast?rev=62144&view=rev Log: use 11.3 repositories and remove dropped packages, it's now maintained in the product Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Wed Jun 23 10:13:32 2010 @@ -192,10 +192,9 @@ <online_repos_preselected config:type="boolean">false</online_repos_preselected>  - <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_112_Servers.xml</external_sources_link> + <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_113_Servers.xml</external_sources_link> -  - <dropped_packages>FreeNX NX RealPlayer ant-jai art-sharp asterisk asterisk-alsa asterisk-capi asterisk-spandsp asterisk-zaptel astools avalon-framework avalon-framework-manual avalon-logkit avalon-logkit-javadoc avmailgate bbtools bitchx blackbox colorgcc compat-curl2 cpp41 cpp42 cups-SUSE-ppds-dat db42 dbus-1-gtk devs dockutils dragonegg ejb-javadoc freeciv ftgl gal2 gcc41 gcc41-32bit gcc41-ada gcc41-c++ gcc41-fortran gcc41-fortran-32bit gcc41-gij gcc41-gij-32bit gcc41-info gcc41-java gcc41-locale gcc41-obj-c++ gcc41-objc gcc41-objc-32bitgcc42 gcc42-32bit gcc42-c++ gcc42-fortran gcc42-fortran-32bit gcc42-gij gcc42-info gcc42-java gcc42-objc gcc42-objc-32bit gconf-sharp gecko-sharp glade-sharp glib-sharp gnome-cups-manager gnome-filesystem gnome-keyring-manager gnome-mime-data gnome-printer-add gnome-sharp gtk-engines gtk-qt-engine gtk-sharp gtk-sharp-complete gtk-sharp-gapi gtkglarea gtkhtml-sharp2 hermes ial indeview ipgrab ipw3945d ircd jaf-demo jaf-javadoc jaf-manual jai java-1_4_2-cacao java-1_4_2-cacao-devel java-1_4_2-sun java-1_4_2-sun-devel java-1_4_2-sun-plugin javamail-manual jms-javadoc jmx jmx-javadoc jta jta-javadoc kbilliards kfs kino knx kssh libGraphicsMagick1 libMagick10 libWand10 libcurl2 libdjvulibre15 libdvdread3 libexiv2 libgcc41 libgcc41-32bit libgcj41 libgcj41-32bit libgcj41-devel libgcj42 libgcj42-devel libgfortran42 libgfortran42-32bit libgmime-2_0-2 libgpod libgpod2 libiniparser libiniparser-32bit libipoddevice libkdcraw1 libkexiv2 libltdl-3-32bit libmtp libmudflap41 libmudflap41-32bit libmudflap42 libmudflap42-32bit libpisync0 libpri libqtpod librasqal0 libsoprano3 libsoprano3-32bit libstdc++41 libstdc++41-32bit libstdc++41-devel libstdc++42-devel libusb libzypp-zmd-backend limal-bootloader man-pages-de multisync openbox perl-Xmms planmaker powersave-libs qjackconnect radiusclient resmgr-32bit rsaref rsvg-sharp2 rubygem-actionwebservice rug samba-pdb sax2-libsax-csharp siga simutrans sqlite-zmd supertux synce synce-kde tei_3 textmaker tomcat5 tomcat55 tomcat55-common-lib tomcat55-jasper tomcat55-jsp-2_0-api tomcat55-server-lib tomcat55-servlet-2_4-api tpb unace varmon vte-sharp vte-sharp2 websh wlan-kmp-xen xen-doc-ps xgl xgl-hardware-list xmms xmms-jack xmms-lib xmoto yast2-bluetooth yast2-bootfloppy yast2-power-management yast2-powertweak zaptel zaptel-kmp-default zen-updater zmd zope</dropped_packages> + <dropped_packages></dropped_packages> <extra_urls config:type="list">  <extra_url> -- 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] r62143 - /tags/stable-2_19_33/network/
by mzugec＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: mzugec Date: Wed Jun 23 10:12:04 2010 New Revision: 62143 URL: http://svn.opensuse.org/viewcvs/yast?rev=62143&view=rev Log: Created tag stable-2_19_33 for network Added: tags/stable-2_19_33/network/ - copied from r62142, trunk/network/ -- 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] r62142 - /tags/stable-2_19_33/
by mzugec＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: mzugec Date: Wed Jun 23 10:12:02 2010 New Revision: 62142 URL: http://svn.opensuse.org/viewcvs/yast?rev=62142&view=rev Log: Created tag stable-2_19_33 Added: tags/stable-2_19_33/ -- 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] r62141 - in /trunk/network: VERSION package/yast2-network.changes src/modules/LanUdevAuto.ycp
by mzugec＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: mzugec Date: Wed Jun 23 10:11:51 2010 New Revision: 62141 URL: http://svn.opensuse.org/viewcvs/yast?rev=62141&view=rev Log: L3: AY Layer2 support (bnc#573607) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62141&r1=621… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Jun 23 10:11:51 2010 @@ -1 +1 @@ -2.19.32 +2.19.33 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Jun 23 10:11:51 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 23 09:41:31 CEST 2010 - mzugec(a)suse.cz + +- L3: AY Layer2 support (bnc#573607) +- 2.19.33 + +------------------------------------------------------------------- Tue Jun 22 12:36:47 CEST 2010 - mzugec(a)suse.cz - updated firmware dependency list (bnc#608979) Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.… ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Wed Jun 23 10:11:51 2010 @@ -126,6 +126,7 @@ LanItems::Select(""); LanItems::type=rule["type"]:""; LanItems::qeth_chanids=rule["chanids"]:""; + LanItems::qeth_layer2 = rule["layer2"]:false; switch(rule["type"]:""){ case "qeth": LanItems::chan_mode=rule["portname"]:""; @@ -183,11 +184,13 @@ if (size(port_name["stdout"]:"")>0) portname=String::CutBlanks(port_name["stdout"]:""); map <string, any> proto=(map<string, any>)SCR::Execute(.target.bash_output, sformat("cat /sys/class/net/%1/device/protocol|tr -d '\n'", device)); if (size(proto["stdout"]:"")>0) protocol=String::CutBlanks(proto["stdout"]:""); + boolean layer2 = ((integer)SCR::Execute(.target.bash, sformat("grep -q 1 /sys/class/net/%1/device/layer2", device))==0) ? true : false; AY["s390-devices", device]=$["type":device_type]; if (size(chanids)>0) AY["s390-devices", device, "chanids"]=chanids; // if (size(portname)>0) AY[device, "portname"]=portname; if (size(protocol)>0) AY["s390-devices", device, "protocol"]=protocol; + if (layer2) AY["s390-devices", device, "layer2"]=true; map<string, any> port0 = (map<string, any>)SCR::Execute(.target.bash_output, sformat("port0=$(ls -l /sys/class/net/%1/device/cdev0);echo ${port0##*/}|tr -d '\n'", device)); y2milestone("port0 %1", port0); -- 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] r62140 - /tags/branch-Code-11-SP1-2_17_138/network/
by mzugec＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: mzugec Date: Wed Jun 23 10:11:46 2010 New Revision: 62140 URL: http://svn.opensuse.org/viewcvs/yast?rev=62140&view=rev Log: Created tag branch-Code-11-SP1-2_17_138 for network Added: tags/branch-Code-11-SP1-2_17_138/network/ (props changed) - copied from r62139, branches/SuSE-Code-11-SP1-Branch/network/ -- 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] r62139 - /tags/branch-Code-11-SP1-2_17_138/
by mzugec＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: mzugec Date: Wed Jun 23 10:11:44 2010 New Revision: 62139 URL: http://svn.opensuse.org/viewcvs/yast?rev=62139&view=rev Log: Created tag branch-Code-11-SP1-2_17_138 Added: tags/branch-Code-11-SP1-2_17_138/ -- 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] r62138 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/modules/LanUdevAuto.ycp
by mzugec＠svn.opensuse.org 23 Jun '10

23 Jun '10

Author: mzugec Date: Wed Jun 23 10:11:37 2010 New Revision: 62138 URL: http://svn.opensuse.org/viewcvs/yast?rev=62138&view=rev Log: L3: AY Layer2 support (bnc#573607) 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/modules/LanUdevAuto.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 Jun 23 10:11:37 2010 @@ -1 +1 @@ -2.17.137 +2.17.138 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 Jun 23 10:11:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 22 16:09:27 CEST 2010 - mzugec(a)suse.cz + +- L3: AY Layer2 support (bnc#573607) +- 2.17.138 + +------------------------------------------------------------------- Thu May 6 19:05:34 CEST 2010 - mzugec(a)suse.cz - correctly assign provider to modem configuration (bnc#602019) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp Wed Jun 23 10:11:37 2010 @@ -126,6 +126,7 @@ LanItems::Select(""); LanItems::type=rule["type"]:""; LanItems::qeth_chanids=rule["chanids"]:""; + LanItems::qeth_layer2 = rule["layer2"]:false; switch(rule["type"]:""){ case "qeth": LanItems::chan_mode=rule["portname"]:""; @@ -183,11 +184,13 @@ if (size(port_name["stdout"]:"")>0) portname=String::CutBlanks(port_name["stdout"]:""); map <string, any> proto=(map<string, any>)SCR::Execute(.target.bash_output, sformat("cat /sys/class/net/%1/device/protocol|tr -d '\n'", device)); if (size(proto["stdout"]:"")>0) protocol=String::CutBlanks(proto["stdout"]:""); + boolean layer2 = ((integer)SCR::Execute(.target.bash, sformat("grep -q 1 /sys/class/net/%1/device/layer2", device))==0) ? true : false; AY["s390-devices", device]=$["type":device_type]; if (size(chanids)>0) AY["s390-devices", device, "chanids"]=chanids; // if (size(portname)>0) AY[device, "portname"]=portname; if (size(protocol)>0) AY["s390-devices", device, "protocol"]=protocol; + if (layer2) AY["s390-devices", device, "layer2"]=true; map<string, any> port0 = (map<string, any>)SCR::Execute(.target.bash_output, sformat("port0=$(ls -l /sys/class/net/%1/device/cdev0);echo ${port0##*/}|tr -d '\n'", device)); y2internal("port0 %1", port0); -- 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] r62137 - in /trunk/gtk: ChangeLog src/YGDialog.cc
by rpmcruz＠svn.opensuse.org 22 Jun '10

22 Jun '10

Author: rpmcruz Date: Tue Jun 22 19:38:43 2010 New Revision: 62137 URL: http://svn.opensuse.org/viewcvs/yast?rev=62137&view=rev Log: bug fix 615927 Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62137&r1=62136… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Jun 22 19:38:43 2010 @@ -1,3 +1,8 @@ +2010-06-22 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGDialog.cc: bug fix 615927: don't steal focus + on taskbar highlight. + 2010-06-16 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/pkg-selector-help.cc: changed from header Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=62137&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Tue Jun 22 19:38:43 2010 @@ -117,6 +117,8 @@ G_CALLBACK (close_window_cb), this); g_signal_connect_after (G_OBJECT (m_widget), "key-press-event", G_CALLBACK (key_pressed_cb), this); + g_signal_connect (G_OBJECT (m_widget), "focus-in-event", + G_CALLBACK (focus_in_event_cb), this); // set busy cursor at start g_signal_connect_after (G_OBJECT (m_widget), "realize", G_CALLBACK (realize_cb), this); @@ -264,6 +266,9 @@ return FALSE; } + static gboolean focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event) + { gtk_window_set_urgency_hint (GTK_WINDOW (widget), FALSE); } + static void realize_cb (GtkWidget *widget, YGWindow *pThis) { pThis->busyCursor(); } @@ -350,7 +355,9 @@ void YGDialog::present() { - gtk_window_present (GTK_WINDOW (m_window->getWidget())); + GtkWindow *window = GTK_WINDOW (m_window->getWidget()); + if (!gtk_window_is_active (window)) + gtk_window_set_urgency_hint (window, TRUE); } YGDialog *YGDialog::currentDialog() -- 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] r62136 - /tags/stable-2_19_32/network/
by mzugec＠svn.opensuse.org 22 Jun '10

22 Jun '10

Author: mzugec Date: Tue Jun 22 12:37:47 2010 New Revision: 62136 URL: http://svn.opensuse.org/viewcvs/yast?rev=62136&view=rev Log: Created tag stable-2_19_32 for network Added: tags/stable-2_19_32/network/ - copied from r62135, trunk/network/ -- 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] r62135 - /tags/stable-2_19_32/
by mzugec＠svn.opensuse.org 22 Jun '10

22 Jun '10

Author: mzugec Date: Tue Jun 22 12:37:43 2010 New Revision: 62135 URL: http://svn.opensuse.org/viewcvs/yast?rev=62135&view=rev Log: Created tag stable-2_19_32 Added: tags/stable-2_19_32/ -- 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] r62134 - in /trunk/network: VERSION package/yast2-network.changes src/modules/LanItems.ycp
by mzugec＠svn.opensuse.org 22 Jun '10

22 Jun '10

Author: mzugec Date: Tue Jun 22 12:37:36 2010 New Revision: 62134 URL: http://svn.opensuse.org/viewcvs/yast?rev=62134&view=rev Log: updated firmware dependency list (bnc#608979) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62134&r1=621… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Jun 22 12:37:36 2010 @@ -1 +1 @@ -2.19.31 +2.19.32 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Jun 22 12:37:36 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 22 12:36:47 CEST 2010 - mzugec(a)suse.cz + +- updated firmware dependency list (bnc#608979) +- 2.19.32 + +------------------------------------------------------------------- Thu May 27 13:54:45 CEST 2010 - mzugec(a)suse.cz - fixed duplicate items issue in UI (bnc#584842) Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Tue Jun 22 12:37:36 2010 @@ -161,8 +161,12 @@ "ipw2100" : "ipw-firmware", "ipw2200" : "ipw-firmware", "ipw3945" : "ipw-firmware", - "iwl3945" : "iwl3945-ucode", - "iwl4965" : "iwl4965-ucode", + "iwl1000" : "kernel-firmware", + "iwl3945" : "kernel-firmware", + "iwl4965" : "kernel-firmware", + "iwl5000" : "kernel-firmware", + "iwl5150" : "kernel-firmware", + "iwl6000" : "kernel-firmware", "b43" : "b43-fwcutter", "b43-pci-bridge" : "b43-fwcutter", "rt73usb" : "ralink-firmware", -- 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] r62133 - /trunk/storage/storage/src/include/ep-lib.ycp
by aschnell＠svn.opensuse.org 21 Jun '10

21 Jun '10

Author: aschnell Date: Mon Jun 21 17:19:36 2010 New Revision: 62133 URL: http://svn.opensuse.org/viewcvs/yast?rev=62133&view=rev Log: - improved size heuristic a bit for ncurses Modified: trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Mon Jun 21 17:19:36 2010 @@ -416,14 +416,14 @@ // anything about the font size or the actually available space nor is // it run when the dialog is resized. + map display_info = UI::GetDisplayInfo(); + boolean textmode = display_info["TextMode"]:false; + integer width = display_info["DefaultWidth"]:1024; + integer max_buttons = 6; - if (Mode::installation()) - { - map display_info = UI::GetDisplayInfo(); - if (display_info["DefaultWidth"]:1024 <= 800) - max_buttons = 3; - } + if ((textmode && width <= 140) || (!textmode && Mode::installation() && width <= 800)) + max_buttons = 3; term ret = `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] r62132 - /branches/tmp/lslezak/sound/data/Makefile.am
by lslezak＠svn.opensuse.org 21 Jun '10

21 Jun '10

Author: lslezak Date: Mon Jun 21 17:06:43 2010 New Revision: 62132 URL: http://svn.opensuse.org/viewcvs/yast?rev=62132&view=rev Log: Makefile.am - delete the sound DB in 'make clean' target, do syntax checking after building the sound DB (verification) Modified: branches/tmp/lslezak/sound/data/Makefile.am Modified: branches/tmp/lslezak/sound/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/Makefi… ============================================================================== --- branches/tmp/lslezak/sound/data/Makefile.am (original) +++ branches/tmp/lslezak/sound/data/Makefile.am Mon Jun 21 17:06:43 2010 @@ -12,5 +12,9 @@ sndcards.ycp: $(sound_db_generator) ./generate_soundcard_db.rb > sndcards.ycp +# verify the validity (syntax check) + ycpc -E -q sndcards.ycp + +CLEANFILES = sndcards.ycp EXTRA_DIST = alsa_packages.ycp $(sound_db_generator) -- 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] r62131 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd.ycp storage/src/include/ep-lib.ycp
by aschnell＠svn.opensuse.org 21 Jun '10

21 Jun '10

Author: aschnell Date: Mon Jun 21 16:57:45 2010 New Revision: 62131 URL: http://svn.opensuse.org/viewcvs/yast?rev=62131&view=rev Log: - avoid unreadable buttons (bnc #615377) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jun 21 16:57:45 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jun 21 16:42:34 CEST 2010 - aschnell(a)suse.de + +- avoid unreadable buttons (bnc #615377) + +------------------------------------------------------------------- Mon May 17 18:54:36 CEST 2010 - fehr(a)suse.de - prevent asking for crypt password even when nothing has been Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Mon Jun 21 16:57:45 2010 @@ -59,9 +59,9 @@ } - term HdButtonBox() + list<term> HdButtons() { - return `HBox( + return [ // push button text `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), // push button text @@ -70,7 +70,7 @@ `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), // push button text `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) - ); + ]; } @@ -159,12 +159,12 @@ `IconAndHeading(_("Hard Disks"), StorageIcons::hd_icon), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), - `HBox( - // push button text - `PushButton(`id(`add),`opt(`key_F3), _("Add Partition...")), - HdButtonBox(), - `HStretch() - ) + ArrangeButtons(flatten([ + [ // push button text + `PushButton(`id(`add),`opt(`key_F3), _("Add Partition...")) ], + HdButtons(), + [ `HStretch() ] + ])) ) ) ); @@ -317,13 +317,14 @@ `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), `HBox( - // push button text - `PushButton(`id(`add),`opt(`key_F3), _("Add...")), - HdButtonBox(), - `HStretch(), - // menu button text - `MenuButton(`opt(`key_F7), _("Expert..."), expert_cmds) - ) + ArrangeButtons(flatten([ + [ // push button text + `PushButton(`id(`add),`opt(`key_F3), _("Add...")) ], + HdButtons(), + [ `HStretch(), + // menu button text + `MenuButton(`opt(`key_F7), _("Expert..."), expert_cmds)] + ]))) )); // helptext @@ -470,11 +471,11 @@ // heading `IconAndHeading(sformat(_("Partition: %1"), device), StorageIcons::hd_part_icon), StorageFields::Overview(fields, target_map, device), - `HBox( - HdButtonBox(), - `HStretch() - ) - ) + ArrangeButtons(flatten([ + HdButtons(), + [ `HStretch() ] + ])) + ) ) ); Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Mon Jun 21 16:57:45 2010 @@ -407,4 +407,55 @@ return part_summary + config_summary; } + + term ArrangeButtons(list<term> buttons) + { + // Unfortunately the UI does not provide functionality to rearrange + // buttons in two lines if the available space is limited. This + // implementation in YCP has several drawbacks, e.g. it does not know + // anything about the font size or the actually available space nor is + // it run when the dialog is resized. + + integer max_buttons = 6; + + if (Mode::installation()) + { + map display_info = UI::GetDisplayInfo(); + if (display_info["DefaultWidth"]:1024 <= 800) + max_buttons = 3; + } + + term ret = `VBox(); + + term line = `HBox(); + + integer i = 0; + integer j = 0; + + foreach(term button, buttons, { + + line = add(line, button); + i = i + 1; + + if (contains([ `PushButton, `MenuButton ], symbolof(button))) + { + j = j + 1; + + if (j == max_buttons) + { + if (i != size(buttons)) + line = add(line, `HStretch()); + + ret = add(ret, line); + line = `HBox(); + j = 0; + } + } + }); + + ret = add(ret, line); + + return ret; + } + } -- 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] r62130 - in /branches/tmp/lslezak/sound: VERSION data/Makefile.am
by lslezak＠svn.opensuse.org 21 Jun '10

21 Jun '10

Author: lslezak Date: Mon Jun 21 16:40:29 2010 New Revision: 62130 URL: http://svn.opensuse.org/viewcvs/yast?rev=62130&view=rev Log: fixed Makefile.am Modified: branches/tmp/lslezak/sound/VERSION branches/tmp/lslezak/sound/data/Makefile.am Modified: branches/tmp/lslezak/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/VERSION?rev… ============================================================================== --- branches/tmp/lslezak/sound/VERSION (original) +++ branches/tmp/lslezak/sound/VERSION Mon Jun 21 16:40:29 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: branches/tmp/lslezak/sound/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/data/Makefi… ============================================================================== --- branches/tmp/lslezak/sound/data/Makefile.am (original) +++ branches/tmp/lslezak/sound/data/Makefile.am Mon Jun 21 16:40:29 2010 @@ -6,11 +6,11 @@ SUBDIRS = doc -ydata_DATA = alsa_packages.ycp +ydata_DATA = alsa_packages.ycp sndcards.ycp sound_db_generator = alsa_drivers.rb data_cards.rb data_joystick.rb data_mixer.rb generate_soundcard_db.rb sound_db_generator.rb ycp_format.rb sndcards.ycp: $(sound_db_generator) - generate_soundcard_db.rb > sndcards.ycp + ./generate_soundcard_db.rb > sndcards.ycp -EXTRA_DIST = $(ydata_DATA) $(sound_db_generator) +EXTRA_DIST = alsa_packages.ycp $(sound_db_generator) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0