- openSUSE Commits

commit libgtop
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package libgtop checked in at Wed Mar 29 00:15:00 CEST 2006. -------- --- /work/SRC/all/GNOME/libgtop/libgtop.changes 2006-02-04 15:11:29.000000000 +0100 +++ /work/src/done/STABLE/libgtop/libgtop.changes 2006-03-28 19:34:36.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 28 19:32:59 CEST 2006 - joeshaw(a)suse.de + +- Add a patch which makes the "Resident" field RSS - Shared, + rather than just being a duplicate of RSS. Fixes half of + bnc #157022. Submitted upstream as bgo #336376. +- Remove an unused, commented-out patch + +------------------------------------------------------------------- Old: ---- libgtop-2.0.2.diff New: ---- libgtop-resident-field-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgtop.spec ++++++ --- /var/tmp/diff_new_pack.Ybxqsj/_old 2006-03-29 00:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ybxqsj/_new 2006-03-29 00:13:16.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,10 +20,10 @@ PreReq: %install_info_prereq Autoreqprov: on Version: 2.12.2 -Release: 5 +Release: 13 Summary: LibGTop Library Source0: ftp://ftp.gnome.org/pub/GNOME/stable/sources/libgtop/%{name}-%{version}.tar… -Patch: %{name}-2.0.2.diff +Patch: libgtop-resident-field-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,7 +62,7 @@ %prep %setup -#%patch -p1 +%patch %build rename no nb po/no.* @@ -120,6 +120,11 @@ # %{prefix}/include/gnome/gnomesupport.h %changelog -n libgtop +* Tue Mar 28 2006 - joeshaw(a)suse.de +- Add a patch which makes the "Resident" field RSS - Shared, + rather than just being a duplicate of RSS. Fixes half of + bnc #157022. Submitted upstream as bgo #336376. +- Remove an unused, commented-out patch * Sat Feb 04 2006 - aj(a)suse.de - Reduce BuildRequires. * Thu Jan 26 2006 - sbrabec(a)suse.cz ++++++ libgtop-resident-field-fix.patch ++++++ Index: sysdeps/linux/procmem.c =================================================================== RCS file: /cvs/gnome/libgtop/sysdeps/linux/procmem.c,v retrieving revision 1.27 diff -u -p -u -r1.27 procmem.c --- sysdeps/linux/procmem.c 22 Jul 2005 19:20:39 -0000 1.27 +++ sysdeps/linux/procmem.c 28 Mar 2006 17:10:25 -0000 @@ -75,13 +75,16 @@ glibtop_get_proc_mem_s (glibtop *server, return; buf->size = strtoull (buffer, &p, 0); - buf->resident = strtoull (p, &p, 0); + + p = skip_token (p); /* RSS again */ + buf->share = strtoull (p, &p, 0); buf->size *= pagesize; - buf->resident *= pagesize; buf->share *= pagesize; buf->rss *= pagesize; + + buf->resident = buf->rss - buf->share; buf->flags |= _glibtop_sysdeps_proc_mem_statm; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gnome-system-monitor
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package gnome-system-monitor checked in at Wed Mar 29 00:11:29 CEST 2006. -------- --- /work/SRC/all/GNOME/gnome-system-monitor/gnome-system-monitor.changes 2006-03-24 17:56:30.000000000 +0100 +++ /work/src/done/STABLE/gnome-system-monitor/gnome-system-monitor.changes 2006-03-28 19:41:24.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 28 19:40:53 CEST 2006 - joeshaw(a)suse.de + +- Add a patch to show the "Resident" field by default, not the + "Virtual memory" field. Fixes half of bnc #157022. + +------------------------------------------------------------------- New: ---- gnome-system-monitor-resident-schema.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-system-monitor.spec ++++++ --- /var/tmp/diff_new_pack.LzxLm2/_old 2006-03-29 00:11:07.000000000 +0200 +++ /var/tmp/diff_new_pack.LzxLm2/_new 2006-03-29 00:11:07.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.12.2 -Release: 16 +Release: 17 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.0/%{name}-%{ve… Source1: n-side.png URL: http://www.gnome.org @@ -28,6 +28,7 @@ PreReq: filesystem gconf2 /usr/bin/touch Patch: gnome-system-monitor-desktop.patch Patch1: gnome-system-monitor-sysinfo.patch +Patch2: gnome-system-monitor-resident-schema.patch %description GNOME-system-monitor (formerly Procman) is a simple process and system @@ -47,6 +48,7 @@ gnome-patch-translation-prepare %patch -p1 %patch1 +%patch2 gnome-patch-translation-update %{?suse_update_config:%{suse_update_config}} @@ -101,6 +103,9 @@ %{sysconfdir}/gconf/schemas/gnome-system-monitor.schemas %changelog -n gnome-system-monitor +* Tue Mar 28 2006 - joeshaw(a)suse.de +- Add a patch to show the "Resident" field by default, not the + "Virtual memory" field. Fixes half of bnc #157022. * Fri Mar 24 2006 - jimmyk(a)suse.de - Fix for BNC #158516. * Mon Mar 13 2006 - rml(a)suse.de ++++++ gnome-system-monitor-resident-schema.patch ++++++ Index: src/gnome-system-monitor.schemas.in =================================================================== RCS file: /cvs/gnome/gnome-system-monitor/src/gnome-system-monitor.schemas.in,v retrieving revision 1.9 diff -u -p -u -r1.9 gnome-system-monitor.schemas.in --- src/gnome-system-monitor.schemas.in 13 Jun 2005 19:51:15 -0000 1.9 +++ src/gnome-system-monitor.schemas.in 28 Mar 2006 17:25:17 -0000 @@ -439,7 +439,7 @@ <applyto>/apps/procman/proctree/col_4_visible</applyto> <owner>procman</owner> <type>bool</type> - <default>TRUE</default> + <default>FALSE</default> <locale name="C"> <short>Show column zero on startup</short> <long></long> @@ -463,7 +463,7 @@ <applyto>/apps/procman/proctree/col_5_visible</applyto> <owner>procman</owner> <type>bool</type> - <default>FALSE</default> + <default>TRUE</default> <locale name="C"> <short>Show column zero on startup</short> <long></long> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit freeradius
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package freeradius checked in at Wed Mar 29 00:11:01 CEST 2006. -------- --- /work/SRC/all/freeradius/freeradius.changes 2006-03-27 14:32:15.000000000 +0200 +++ /work/src/done/STABLE/freeradius/freeradius.changes 2006-03-28 21:04:23.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Mar 28 20:22:34 CEST 2006 - stark(a)suse.de + +- fixed an error on x86_64 machines when reading dictionaries + (#161503) +- make "use_tunneled_reply" work properly for PEAP + +------------------------------------------------------------------- New: ---- dict.patch peap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeradius.spec ++++++ --- /var/tmp/diff_new_pack.WWusJJ/_old 2006-03-29 00:07:57.000000000 +0200 +++ /var/tmp/diff_new_pack.WWusJJ/_new 2006-03-29 00:07:57.000000000 +0200 @@ -16,7 +16,7 @@ Provides: radiusd Conflicts: radiusd-livingston radiusd-cistron icradius Version: 1.1.0 -Release: 12 +Release: 13 URL: http://www.freeradius.org/ Summary: Very Highly Configurable Radius Server Source0: %{name}-%{version}.tar.bz2 @@ -31,6 +31,8 @@ Patch3: ltdl.patch Patch4: dialup_admin.patch Patch5: mschapv2.patch +Patch6: dict.patch +Patch7: peap.patch %if %suse_version > 800 PreReq: /usr/sbin/useradd /usr/sbin/groupadd PreReq: %insserv_prereq %fillup_prereq @@ -114,6 +116,8 @@ %patch3 %patch4 %patch5 +%patch6 +%patch7 rm -rf `find . -name CVS` mkdir novell cp -f %{SOURCE3} %{SOURCE4} novell/ @@ -347,6 +351,10 @@ #%attr(644,root,root) /usr/lib/freeradius/*.la %changelog -n freeradius +* Tue Mar 28 2006 - stark(a)suse.de +- fixed an error on x86_64 machines when reading dictionaries + (#161503) +- make "use_tunneled_reply" work properly for PEAP * Mon Mar 27 2006 - ro(a)suse.de - also use fPIC on s390* * Thu Mar 23 2006 - stark(a)suse.de ++++++ dict.patch ++++++ --- src/lib/dict.c +++ src/lib/dict.c @@ -1207,7 +1207,7 @@ if (!name) return NULL; hash = dict_hashname(name); - hash = lrad_hash_update(&attr, sizeof(&attr), hash); + hash = lrad_hash_update(&attr, sizeof(attr), hash); return lrad_hash_table_finddata(values_byname, hash); } ++++++ peap.patch ++++++ Index: rlm_eap_peap.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- rlm_eap_peap.c 26 Feb 2004 19:04:31 -0000 1.5 +++ src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c 21 Nov 2004 14:32:14 -0000 1.6 @@ -131,6 +131,7 @@ static void peap_free(void *p) pairfree(&t->username); pairfree(&t->state); + pairfree(&t->accept_vps); free(t); } @@ -251,9 +252,22 @@ static int eappeap_authenticate(void *ar case RLM_MODULE_OK: eaptls_success(handler->eap_ds, 0); + + /* + * Move the saved VP's from the Access-Accept to + * our Access-Accept. + */ + if (((peap_tunnel_t *) tls_session->opaque)->accept_vps) { + DEBUG2(" Using saved attributes from the original Access-Accept"); + } + pairadd(&handler->request->reply->vps, + ((peap_tunnel_t *) tls_session->opaque)->accept_vps); + ((peap_tunnel_t *) tls_session->opaque)->accept_vps = NULL; + eaptls_gen_mppe_keys(&handler->request->reply->vps, tls_session->ssl, "client EAP encryption"); + return 1; /* Index: eap_peap.h =================================================================== RCS file: /source/radiusd/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- eap_peap.h 26 Feb 2004 19:04:30 -0000 1.5 +++ src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h 21 Nov 2004 14:32:14 -0000 1.6 @@ -27,7 +27,9 @@ typedef struct peap_tunnel_t { VALUE_PAIR *username; VALUE_PAIR *state; + VALUE_PAIR *accept_vps; int status; + int home_access_accept; int default_eap_type; int copy_request_to_tunnel; int use_tunneled_reply; Index: peap.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_eap/types/rlm_eap_peap/peap.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- peap.c 9 Aug 2004 13:36:33 -0000 1.12 +++ src/modules/rlm_eap/types/rlm_eap_peap/peap.c 21 Nov 2004 14:32:14 -0000 1.13 @@ -290,13 +290,16 @@ static int process_reply(EAP_HANDLER *ha * tunneled user! */ if (t->use_tunneled_reply) { + DEBUG2(" Saving tunneled attributes for later"); + /* * Clean up the tunneled reply. */ pairdelete(&reply->vps, PW_PROXY_STATE); pairdelete(&reply->vps, PW_EAP_MESSAGE); + pairdelete(&reply->vps, PW_MESSAGE_AUTHENTICATOR); - pairadd(&request->reply->vps, reply->vps); + t->accept_vps = reply->vps; reply->vps = NULL; } break; @@ -328,6 +331,26 @@ static int process_reply(EAP_HANDLER *ha pairmove2(&vp, &(reply->vps), PW_EAP_MESSAGE); /* + * Handle EAP-MSCHAP-V2, where Access-Accept's + * from the home server may contain MS-CHAP-Success, + * which the module turns into challenges, so that + * the client may respond to the challenge with + * an "ack" packet. + */ + if (t->home_access_accept && t->use_tunneled_reply) { + DEBUG2(" Saving tunneled attributes for later"); + + /* + * Clean up the tunneled reply. + */ + pairdelete(&reply->vps, PW_PROXY_STATE); + pairdelete(&reply->vps, PW_MESSAGE_AUTHENTICATOR); + + t->accept_vps = reply->vps; + reply->vps = NULL; + } + + /* * Handle the ACK, by tunneling any necessary reply * VP's back to the client. */ @@ -374,6 +397,9 @@ static int eappeap_postproxy(EAP_HANDLER if (fake && (handler->request->proxy_reply->code == PW_AUTHENTICATION_ACK)) { VALUE_PAIR *vp; REQUEST *request = handler->request; + peap_tunnel_t *t = tls_session->opaque; + + t->home_access_accept = TRUE; /* * Terrible hacks. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-installation
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package yast2-installation checked in at Tue Mar 28 21:57:01 CEST 2006. -------- --- /work/SRC/noarch/yast2-installation/yast2-installation.changes 2006-03-24 15:17:11.000000000 +0100 +++ /work/src/done/NOARCH/yast2-installation/yast2-installation.changes 2006-03-28 21:48:53.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Mar 28 21:29:07 CEST 2006 - jdsn(a)suse.de + +- added 'rm -f /var/lib/zypp/zmd_updated_the_sources' + flag file to be deleted if suse_register runs during installation + file checked by online update - deletion requested by mvidner +- 2.13.51 + +------------------------------------------------------------------- +Tue Mar 28 20:53:13 CEST 2006 - jdsn(a)suse.de + +- added autoyast part of suse_register +- icon for product registration (#160293) +- fixes for inst_suse_register +- 2.13.50 + +------------------------------------------------------------------- +Mon Mar 27 23:47:38 CEST 2006 - jsrain(a)suse.de + +- removed desktop selection from NLD workflow (#160650) + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.49.tar.bz2 New: ---- yast2-installation-2.13.51.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.WIf8pR/_old 2006-03-28 21:52:56.000000000 +0200 +++ /var/tmp/diff_new_pack.WIf8pR/_new 2006-03-28 21:52:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.49) +# spec file for package yast2-installation (Version 2.13.51) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.13.49 +Version: 2.13.51 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.49.tar.bz2 +Source0: yast2-installation-2.13.51.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-installation-2.13.49 +%setup -n yast2-installation-2.13.51 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,18 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Tue Mar 28 2006 - jdsn(a)suse.de +- added 'rm -f /var/lib/zypp/zmd_updated_the_sources' + flag file to be deleted if suse_register runs during installation + file checked by online update - deletion requested by mvidner +- 2.13.51 +* Tue Mar 28 2006 - jdsn(a)suse.de +- added autoyast part of suse_register +- icon for product registration (#160293) +- fixes for inst_suse_register +- 2.13.50 +* Mon Mar 27 2006 - jsrain(a)suse.de +- removed desktop selection from NLD workflow (#160650) * Fri Mar 24 2006 - locilka(a)suse.cz - Filling up list of release_notes urls for all installed products in the Product.ycp. Needed for internet_test (#160563). ++++++ yast2-installation-2.13.49.tar.bz2 -> yast2-installation-2.13.51.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/VERSION new/yast2-installation-2.13.51/VERSION --- old/yast2-installation-2.13.49/VERSION 2006-03-24 15:15:24.000000000 +0100 +++ new/yast2-installation-2.13.51/VERSION 2006-03-28 21:30:21.000000000 +0200 @@ -1 +1 @@ -2.13.49 +2.13.51 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/configure new/yast2-installation-2.13.51/configure --- old/yast2-installation-2.13.49/configure 2006-03-24 15:52:17.000000000 +0100 +++ new/yast2-installation-2.13.51/configure 2006-03-28 21:43:26.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.49. +# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.51. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.13.49' -PACKAGE_STRING='yast2-installation 2.13.49' +PACKAGE_VERSION='2.13.51' +PACKAGE_STRING='yast2-installation 2.13.51' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-installation 2.13.49 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.13.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.13.49:";; + short | recursive ) echo "Configuration of yast2-installation 2.13.51:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.13.49 +yast2-installation configure 2.13.51 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-installation $as_me 2.13.49, which was +It was created by yast2-installation $as_me 2.13.51, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.13.49' + VERSION='2.13.51' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.49" +VERSION="2.13.51" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2906,7 +2906,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-installation $as_me 2.13.49, which was +This file was extended by yast2-installation $as_me 2.13.51, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2961,7 +2961,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.13.49 +yast2-installation config.status 2.13.51 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/configure.in new/yast2-installation-2.13.51/configure.in --- old/yast2-installation-2.13.49/configure.in 2006-03-24 15:52:11.000000000 +0100 +++ new/yast2-installation-2.13.51/configure.in 2006-03-28 21:43:18.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.49, http://www.suse.de/feedback, yast2-installation) +AC_INIT(yast2-installation, 2.13.51, http://www.suse.de/feedback, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.49" +VERSION="2.13.51" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/control/control.xml new/yast2-installation-2.13.51/control/control.xml --- old/yast2-installation-2.13.49/control/control.xml 2006-03-24 08:16:43.000000000 +0100 +++ new/yast2-installation-2.13.51/control/control.xml 2006-03-27 16:40:15.000000000 +0200 @@ -21,8 +21,8 @@ <enable_clone config:type="boolean">false</enable_clone> </globals> <register> - <enable_register_hwdata config:type="boolean">false</enable_register_hwdata> - <enable_register_optional config:type="boolean">false</enable_register_optional> + <enable_register_hwdata config:type="boolean">true</enable_register_hwdata> + <enable_register_optional config:type="boolean">true</enable_register_optional> </register> <software> <delete_old_packages config:type="boolean">true</delete_old_packages> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/control.pot new/yast2-installation-2.13.51/control.pot --- old/yast2-installation-2.13.49/control.pot 2006-03-16 11:19:51.000000000 +0100 +++ new/yast2-installation-2.13.51/control.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,334 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-16 11:19+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: control/control.PROF.glade:59 control/control.PROF.glade:115 -#: control/control.PROF.glade:404 control/control.PROF.glade:444 -#: control/control.SLD.glade:60 control/control.SLD.glade:116 -#: control/control.SLD.glade:405 control/control.SLD.glade:445 -#: control/control.SLES.glade:60 control/control.SLES.glade:103 -#: control/control.SLES.glade:157 control/control.SLES.glade:175 -#: control/control.SLES.glade:510 control/control.SLES.glade:550 -#: control/control.glade:59 control/control.glade:115 -#: control/control.glade:404 control/control.glade:444 -msgid "Installation Settings" -msgstr "" - -#: control/control.PROF.glade:77 control/control.SLD.glade:78 -#: control/control.SLES.glade:78 control/control.SLES.glade:120 -#: control/control.glade:77 -msgid "Overview" -msgstr "" - -#: control/control.PROF.glade:85 control/control.SLD.glade:86 -#: control/control.SLES.glade:86 control/control.SLES.glade:128 -#: control/control.glade:85 -msgid "Expert" -msgstr "" - -#: control/control.PROF.glade:101 control/control.SLD.glade:102 -#: control/control.SLES.glade:143 control/control.glade:101 -msgid "Update Settings" -msgstr "" - -#: control/control.PROF.glade:132 control/control.SLD.glade:133 -#: control/control.SLES.glade:190 control/control.SLES.glade:231 -#: control/control.glade:132 -msgid "Network Configuration" -msgstr "" - -#: control/control.PROF.glade:172 control/control.PROF.glade:620 -#: control/control.PROF.glade:625 control/control.PROF.glade:629 -#: control/control.SLD.glade:173 control/control.SLD.glade:621 -#: control/control.SLD.glade:626 control/control.SLD.glade:630 -#: control/control.SLES.glade:264 control/control.SLES.glade:275 -#: control/control.SLES.glade:284 control/control.SLES.glade:737 -#: control/control.SLES.glade:742 control/control.SLES.glade:746 -#: control/control.glade:172 control/control.glade:620 -#: control/control.glade:625 control/control.glade:629 -msgid "Hardware Configuration" -msgstr "" - -#: control/control.PROF.glade:191 control/control.PROF.glade:287 -#: control/control.PROF.glade:375 control/control.SLD.glade:192 -#: control/control.SLD.glade:288 control/control.SLD.glade:376 -#: control/control.SLES.glade:303 control/control.SLES.glade:393 -#: control/control.SLES.glade:481 control/control.glade:191 -#: control/control.glade:287 control/control.glade:375 -msgid "Preparation" -msgstr "" - -#: control/control.PROF.glade:197 control/control.PROF.glade:206 -#: control/control.PROF.glade:293 control/control.PROF.glade:302 -#: control/control.PROF.glade:399 control/control.PROF.glade:439 -#: control/control.SLD.glade:198 control/control.SLD.glade:207 -#: control/control.SLD.glade:294 control/control.SLD.glade:303 -#: control/control.SLD.glade:400 control/control.SLD.glade:440 -#: control/control.SLES.glade:309 control/control.SLES.glade:318 -#: control/control.SLES.glade:399 control/control.SLES.glade:408 -#: control/control.SLES.glade:505 control/control.SLES.glade:545 -#: control/control.glade:197 control/control.glade:206 -#: control/control.glade:293 control/control.glade:302 -#: control/control.glade:399 control/control.glade:439 -msgid "Language" -msgstr "" - -#: control/control.PROF.glade:212 control/control.PROF.glade:308 -#: control/control.SLD.glade:213 control/control.SLD.glade:309 -#: control/control.SLES.glade:324 control/control.SLES.glade:414 -#: control/control.glade:212 control/control.glade:308 -msgid "License Agreement" -msgstr "" - -#: control/control.PROF.glade:218 control/control.PROF.glade:314 -#: control/control.SLD.glade:219 control/control.SLD.glade:315 -#: control/control.SLES.glade:330 control/control.SLES.glade:420 -#: control/control.glade:218 control/control.glade:314 -msgid "Disk Activation" -msgstr "" - -#: control/control.PROF.glade:224 control/control.PROF.glade:320 -#: control/control.SLD.glade:225 control/control.SLD.glade:321 -#: control/control.SLES.glade:336 control/control.SLES.glade:426 -#: control/control.glade:224 control/control.glade:320 -msgid "System Analysis" -msgstr "" - -#: control/control.PROF.glade:230 control/control.PROF.glade:332 -#: control/control.SLD.glade:231 control/control.SLD.glade:333 -#: control/control.SLES.glade:342 control/control.SLES.glade:438 -#: control/control.glade:230 control/control.glade:332 -msgid "Add-On Products" -msgstr "" - -#: control/control.PROF.glade:236 control/control.SLD.glade:237 -#: control/control.SLES.glade:348 control/control.glade:236 -msgid "Time Zone" -msgstr "" - -#: control/control.PROF.glade:245 control/control.SLD.glade:246 -#: control/control.glade:245 -msgid "Desktop Selection" -msgstr "" - -#: control/control.PROF.glade:252 control/control.SLD.glade:253 -#: control/control.SLES.glade:358 control/control.glade:252 -msgid "Installation" -msgstr "" - -#: control/control.PROF.glade:255 control/control.SLD.glade:256 -#: control/control.SLES.glade:361 control/control.glade:255 -msgid "Installation Summary" -msgstr "" - -#: control/control.PROF.glade:260 control/control.PROF.glade:266 -#: control/control.PROF.glade:270 control/control.PROF.glade:274 -#: control/control.PROF.glade:278 control/control.PROF.glade:409 -#: control/control.PROF.glade:415 control/control.PROF.glade:419 -#: control/control.PROF.glade:423 control/control.PROF.glade:449 -#: control/control.PROF.glade:455 control/control.PROF.glade:459 -#: control/control.PROF.glade:463 control/control.PROF.glade:550 -#: control/control.PROF.glade:554 control/control.PROF.glade:558 -#: control/control.PROF.glade:662 control/control.PROF.glade:666 -#: control/control.PROF.glade:670 control/control.PROF.glade:674 -#: control/control.PROF.glade:678 control/control.PROF.glade:693 -#: control/control.PROF.glade:697 control/control.PROF.glade:701 -#: control/control.PROF.glade:705 control/control.SLD.glade:261 -#: control/control.SLD.glade:267 control/control.SLD.glade:271 -#: control/control.SLD.glade:275 control/control.SLD.glade:279 -#: control/control.SLD.glade:410 control/control.SLD.glade:416 -#: control/control.SLD.glade:420 control/control.SLD.glade:424 -#: control/control.SLD.glade:450 control/control.SLD.glade:456 -#: control/control.SLD.glade:460 control/control.SLD.glade:464 -#: control/control.SLD.glade:551 control/control.SLD.glade:555 -#: control/control.SLD.glade:559 control/control.SLD.glade:663 -#: control/control.SLD.glade:667 control/control.SLD.glade:671 -#: control/control.SLD.glade:675 control/control.SLD.glade:679 -#: control/control.SLD.glade:694 control/control.SLD.glade:698 -#: control/control.SLD.glade:702 control/control.SLD.glade:706 -#: control/control.SLES.glade:366 control/control.SLES.glade:372 -#: control/control.SLES.glade:376 control/control.SLES.glade:380 -#: control/control.SLES.glade:384 control/control.SLES.glade:515 -#: control/control.SLES.glade:521 control/control.SLES.glade:525 -#: control/control.SLES.glade:529 control/control.SLES.glade:555 -#: control/control.SLES.glade:561 control/control.SLES.glade:565 -#: control/control.SLES.glade:569 control/control.SLES.glade:650 -#: control/control.SLES.glade:654 control/control.SLES.glade:658 -#: control/control.SLES.glade:779 control/control.SLES.glade:783 -#: control/control.SLES.glade:787 control/control.SLES.glade:791 -#: control/control.SLES.glade:795 control/control.SLES.glade:810 -#: control/control.SLES.glade:814 control/control.SLES.glade:818 -#: control/control.SLES.glade:822 control/control.glade:260 -#: control/control.glade:266 control/control.glade:270 -#: control/control.glade:274 control/control.glade:278 -#: control/control.glade:409 control/control.glade:415 -#: control/control.glade:419 control/control.glade:423 -#: control/control.glade:449 control/control.glade:455 -#: control/control.glade:459 control/control.glade:463 -#: control/control.glade:550 control/control.glade:554 -#: control/control.glade:558 control/control.glade:662 -#: control/control.glade:666 control/control.glade:670 -#: control/control.glade:674 control/control.glade:678 -#: control/control.glade:693 control/control.glade:697 -#: control/control.glade:701 control/control.glade:705 -msgid "Perform Installation" -msgstr "" - -#: control/control.PROF.glade:326 control/control.SLD.glade:327 -#: control/control.SLES.glade:432 control/control.glade:326 -msgid "System for Update" -msgstr "" - -#: control/control.PROF.glade:339 control/control.SLD.glade:340 -#: control/control.SLES.glade:445 control/control.glade:339 -msgid "Update" -msgstr "" - -#: control/control.PROF.glade:342 control/control.SLD.glade:343 -#: control/control.SLES.glade:448 control/control.glade:342 -msgid "Update Summary" -msgstr "" - -#: control/control.PROF.glade:347 control/control.PROF.glade:353 -#: control/control.PROF.glade:357 control/control.PROF.glade:361 -#: control/control.PROF.glade:365 control/control.PROF.glade:478 -#: control/control.PROF.glade:482 control/control.SLD.glade:348 -#: control/control.SLD.glade:354 control/control.SLD.glade:358 -#: control/control.SLD.glade:362 control/control.SLD.glade:366 -#: control/control.SLD.glade:479 control/control.SLD.glade:483 -#: control/control.SLES.glade:453 control/control.SLES.glade:459 -#: control/control.SLES.glade:463 control/control.SLES.glade:467 -#: control/control.SLES.glade:471 control/control.SLES.glade:584 -#: control/control.SLES.glade:588 control/control.glade:347 -#: control/control.glade:353 control/control.glade:357 -#: control/control.glade:361 control/control.glade:365 -#: control/control.glade:478 control/control.glade:482 -msgid "Perform Update" -msgstr "" - -#: control/control.PROF.glade:379 control/control.SLD.glade:380 -#: control/control.SLES.glade:485 control/control.glade:379 -msgid "System Information" -msgstr "" - -#: control/control.PROF.glade:383 control/control.SLD.glade:384 -#: control/control.SLES.glade:489 control/control.glade:383 -msgid "Perform Repair" -msgstr "" - -#: control/control.PROF.glade:393 control/control.PROF.glade:433 -#: control/control.PROF.glade:636 control/control.SLD.glade:394 -#: control/control.SLD.glade:434 control/control.SLD.glade:637 -#: control/control.SLES.glade:499 control/control.SLES.glade:539 -#: control/control.SLES.glade:753 control/control.glade:393 -#: control/control.glade:433 control/control.glade:636 -msgid "Base Installation" -msgstr "" - -#: control/control.PROF.glade:487 control/control.PROF.glade:565 -#: control/control.PROF.glade:710 control/control.SLD.glade:488 -#: control/control.SLD.glade:566 control/control.SLD.glade:711 -#: control/control.SLES.glade:593 control/control.SLES.glade:665 -#: control/control.SLES.glade:827 control/control.glade:487 -#: control/control.glade:565 control/control.glade:710 -msgid "Configuration" -msgstr "" - -#: control/control.PROF.glade:490 control/control.PROF.glade:496 -#: control/control.PROF.glade:577 control/control.PROF.glade:582 -#: control/control.PROF.glade:586 control/control.PROF.glade:590 -#: control/control.SLD.glade:491 control/control.SLD.glade:497 -#: control/control.SLD.glade:578 control/control.SLD.glade:583 -#: control/control.SLD.glade:587 control/control.SLD.glade:591 -#: control/control.SLES.glade:596 control/control.SLES.glade:602 -#: control/control.SLES.glade:677 control/control.SLES.glade:682 -#: control/control.SLES.glade:686 control/control.SLES.glade:690 -#: control/control.glade:490 control/control.glade:496 -#: control/control.glade:577 control/control.glade:582 -#: control/control.glade:586 control/control.glade:590 -msgid "Network" -msgstr "" - -#: control/control.PROF.glade:502 control/control.SLD.glade:503 -#: control/control.SLES.glade:694 control/control.glade:502 -msgid "Update Configuration" -msgstr "" - -#: control/control.PROF.glade:508 control/control.PROF.glade:514 -#: control/control.PROF.glade:520 control/control.PROF.glade:594 -#: control/control.PROF.glade:598 control/control.SLD.glade:509 -#: control/control.SLD.glade:515 control/control.SLD.glade:521 -#: control/control.SLD.glade:595 control/control.SLD.glade:599 -#: control/control.SLES.glade:608 control/control.SLES.glade:614 -#: control/control.SLES.glade:620 control/control.SLES.glade:700 -#: control/control.SLES.glade:706 control/control.SLES.glade:710 -#: control/control.glade:508 control/control.glade:514 -#: control/control.glade:520 control/control.glade:594 -#: control/control.glade:598 -msgid "Online Update" -msgstr "" - -#: control/control.PROF.glade:524 control/control.PROF.glade:610 -#: control/control.PROF.glade:717 control/control.SLD.glade:525 -#: control/control.SLD.glade:611 control/control.SLD.glade:718 -#: control/control.SLES.glade:624 control/control.SLES.glade:727 -#: control/control.SLES.glade:834 control/control.glade:524 -#: control/control.glade:610 control/control.glade:717 -msgid "Clean Up" -msgstr "" - -#: control/control.PROF.glade:528 control/control.PROF.glade:616 -#: control/control.SLD.glade:529 control/control.SLD.glade:617 -#: control/control.SLES.glade:628 control/control.SLES.glade:733 -#: control/control.glade:528 control/control.glade:616 -msgid "Release Notes" -msgstr "" - -#: control/control.PROF.glade:568 control/control.SLD.glade:569 -#: control/control.SLES.glade:668 control/control.glade:568 -msgid "Hostname" -msgstr "" - -#: control/control.PROF.glade:573 control/control.SLD.glade:574 -#: control/control.SLES.glade:673 control/control.glade:573 -msgid "Root Password" -msgstr "" - -#: control/control.PROF.glade:602 control/control.PROF.glade:606 -#: control/control.SLD.glade:603 control/control.SLD.glade:607 -#: control/control.SLES.glade:719 control/control.SLES.glade:723 -#: control/control.glade:602 control/control.glade:606 -msgid "Users" -msgstr "" - -#: control/control.PROF.glade:645 control/control.PROF.glade:651 -#: control/control.PROF.glade:655 control/control.SLD.glade:646 -#: control/control.SLD.glade:652 control/control.SLD.glade:656 -#: control/control.SLES.glade:762 control/control.SLES.glade:768 -#: control/control.SLES.glade:772 control/control.glade:645 -#: control/control.glade:651 control/control.glade:655 -msgid "AutoYaST Settings" -msgstr "" - -#: control/control.PROF.glade:713 control/control.SLD.glade:714 -#: control/control.SLES.glade:830 control/control.glade:713 -msgid "System Configuration" -msgstr "" - -#: control/control.SLES.glade:714 -msgid "Service" -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/installation.pot new/yast2-installation-2.13.51/installation.pot --- old/yast2-installation-2.13.49/installation.pot 2006-03-24 09:27:40.000000000 +0100 +++ new/yast2-installation-2.13.51/installation.pot 2006-03-28 20:57:05.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-24 01:27-0700\n" +"POT-Creation-Date: 2006-03-28 20:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -721,103 +721,110 @@ msgstr "" #. strings for main (wizard) layout -#: src/clients/inst_suse_register.ycp:49 +#. Transltors: This is title/brand - only translate the Configuration +#: src/clients/inst_suse_register.ycp:51 msgid "Novell Customer Center Configuration" msgstr "" -#: src/clients/inst_suse_register.ycp:50 +#: src/clients/inst_suse_register.ycp:52 msgid "Update Configuration" msgstr "" -#: src/clients/inst_suse_register.ycp:55 +#: src/clients/inst_suse_register.ycp:58 msgid "" "Get technical support and product updates and\n" "manage subscriptions with Novell Customer Center." msgstr "" -#: src/clients/inst_suse_register.ycp:61 +#: src/clients/inst_suse_register.ycp:64 msgid "Configure Now (Recommended)" msgstr "" -#: src/clients/inst_suse_register.ycp:62 +#: src/clients/inst_suse_register.ycp:65 msgid "Configure Later" msgstr "" -#: src/clients/inst_suse_register.ycp:64 +#: src/clients/inst_suse_register.ycp:67 msgid "Include for Convenience" msgstr "" -#: src/clients/inst_suse_register.ycp:65 +#. Translators: Text for UI Label - capitalized +#: src/clients/inst_suse_register.ycp:68 +#: src/clients/suse_register_auto.ycp:198 msgid "Hardware Profile" msgstr "" -#: src/clients/inst_suse_register.ycp:66 +#. Translators: Text for UI Label - capitalized +#: src/clients/inst_suse_register.ycp:69 +#: src/clients/suse_register_auto.ycp:200 msgid "Optional Information" msgstr "" -#: src/clients/inst_suse_register.ycp:67 -#: src/clients/inst_suse_register.ycp:145 +#: src/clients/inst_suse_register.ycp:70 +#: src/clients/inst_suse_register.ycp:151 msgid "Details..." msgstr "" #. strings for success popup -#: src/clients/inst_suse_register.ycp:71 +#: src/clients/inst_suse_register.ycp:74 msgid "Your configuration was successful." msgstr "" #. strings for manual interaction popup -#: src/clients/inst_suse_register.ycp:75 +#: src/clients/inst_suse_register.ycp:78 msgid "Manual Interaction Required" msgstr "" -#: src/clients/inst_suse_register.ycp:76 +#: src/clients/inst_suse_register.ycp:79 msgid "Needed Information" msgstr "" -#: src/clients/inst_suse_register.ycp:77 +#: src/clients/inst_suse_register.ycp:80 msgid "Continue" msgstr "" -#: src/clients/inst_suse_register.ycp:79 +#: src/clients/inst_suse_register.ycp:82 msgid "" "A Web browser will start in which to complete\n" "the configuration on the opened Web site." msgstr "" #. string for show information popup -#: src/clients/inst_suse_register.ycp:85 +#: src/clients/inst_suse_register.ycp:88 msgid "Registration and Privacy Information" msgstr "" -#: src/clients/inst_suse_register.ycp:89 +#: src/clients/inst_suse_register.ycp:92 msgid "" "The server requires additional system information. Activating \n" "submission of the hardware profile automatically." msgstr "" #. nonroot-message strings -#: src/clients/inst_suse_register.ycp:94 +#: src/clients/inst_suse_register.ycp:97 msgid "Update Source Issues" msgstr "" -#: src/clients/inst_suse_register.ycp:96 +#: src/clients/inst_suse_register.ycp:99 msgid "" "Registering as a regular user does not include the update source\n" -"in YaST Online Update (YOU). To include the source automatically,\n" -"register as root.\n" -"Otherwise use other update tools or add the source to YOU manually." +"in the Online Update YaST module. If you continue and later want \n" +"to update with Online Update, the source must be added manually.\n" +"Other tools, such as Software Updater in the panel, can still be \n" +"used. Alternatively, cancel then register through YaST as root \n" +"so the sources are available to all tools." msgstr "" #. error messages -#: src/clients/inst_suse_register.ycp:104 +#: src/clients/inst_suse_register.ycp:110 msgid "Error: Recieved data is invalid." msgstr "" -#: src/clients/inst_suse_register.ycp:105 +#: src/clients/inst_suse_register.ycp:111 msgid "Error: Could not retrieve data." msgstr "" -#: src/clients/inst_suse_register.ycp:111 +#: src/clients/inst_suse_register.ycp:117 msgid "" "\n" "Configure your system to enable online updates by registering it with Novell.\n" @@ -826,7 +833,7 @@ "" msgstr "" -#: src/clients/inst_suse_register.ycp:119 +#: src/clients/inst_suse_register.ycp:125 msgid "" "\n" "To simplify the registration process, include information from your system\n" @@ -838,7 +845,7 @@ "" msgstr "" -#: src/clients/inst_suse_register.ycp:130 +#: src/clients/inst_suse_register.ycp:136 msgid "" "\n" "No information is passed to anyone outside Novell. The data is used for\n" @@ -849,23 +856,23 @@ msgstr "" #. further strings -#: src/clients/inst_suse_register.ycp:142 +#: src/clients/inst_suse_register.ycp:148 msgid "Checking..." msgstr "" -#: src/clients/inst_suse_register.ycp:143 +#: src/clients/inst_suse_register.ycp:149 msgid "Error" msgstr "" -#: src/clients/inst_suse_register.ycp:144 +#: src/clients/inst_suse_register.ycp:150 msgid "An error occurred while connecting to the server." msgstr "" -#: src/clients/inst_suse_register.ycp:146 +#: src/clients/inst_suse_register.ycp:152 msgid "Error Message" msgstr "" -#: src/clients/inst_suse_register.ycp:147 +#: src/clients/inst_suse_register.ycp:153 msgid "Starting Browser..." msgstr "" @@ -1177,6 +1184,106 @@ msgid "Copying SSH settings to installed system..." msgstr "" +#. Translators: Heading - capitalized +#: src/clients/suse_register_auto.ycp:64 +#: src/clients/suse_register_auto.ycp:176 +msgid "Product Registration" +msgstr "" + +#. Translators: Text in a sentece-like environment - normal capitalization +#: src/clients/suse_register_auto.ycp:66 +msgid "Run during autoinstallation" +msgstr "" + +#: src/clients/suse_register_auto.ycp:66 +msgid "Do not run during autoinstallation" +msgstr "" + +#. Translators: Sentence-like text for singular and plural (incl. zero) of items +#: src/clients/suse_register_auto.ycp:70 +msgid "1 item of registration data" +msgstr "" + +#: src/clients/suse_register_auto.ycp:70 +#, ycp-format +msgid "%1 items of registration data" +msgstr "" + +#: src/clients/suse_register_auto.ycp:74 +msgid "Included Information" +msgstr "" + +#. Translators: Text in a sentece-like environment - normal capitalization +#: src/clients/suse_register_auto.ycp:77 +msgid "Hardware profile" +msgstr "" + +#. Translators: Text in a sentece-like environment - normal capitalization +#: src/clients/suse_register_auto.ycp:79 +msgid "Optional information" +msgstr "" + +#. TextEntry label +#: src/clients/suse_register_auto.ycp:128 +msgid "&Key" +msgstr "" + +#. TextEntry label +#: src/clients/suse_register_auto.ycp:130 +msgid "&Value" +msgstr "" + +#: src/clients/suse_register_auto.ycp:157 +msgid "Key is invalid." +msgstr "" + +#: src/clients/suse_register_auto.ycp:179 +msgid "Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select Run Product Registration. To simplify the procedure, include information from your system with Hardware Profile and Optional Information." +msgstr "" + +#: src/clients/suse_register_auto.ycp:182 +msgid "Get more information about the registration process with <tt>suse_register -h</tt>." +msgstr "" + +#: src/clients/suse_register_auto.ycp:185 +msgid "Other information used for registration is shown in Registration Data. Add a new key and value pair by pressing Add then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with Delete or modify an existing pair with Edit." +msgstr "" + +#. Translators: Text for UI Label - capitalized +#: src/clients/suse_register_auto.ycp:193 +msgid "Run Product Registration" +msgstr "" + +#. Translators: Text for UI Label - capitalized +#: src/clients/suse_register_auto.ycp:196 +msgid "Include in Registration" +msgstr "" + +#. Translators: Text for UI Label - capitalized +#: src/clients/suse_register_auto.ycp:205 +msgid "Registration Data to Use" +msgstr "" + +#: src/clients/suse_register_auto.ycp:206 +msgid "Key" +msgstr "" + +#: src/clients/suse_register_auto.ycp:206 +msgid "Value" +msgstr "" + +#: src/clients/suse_register_auto.ycp:208 +msgid "Ad&d" +msgstr "" + +#: src/clients/suse_register_auto.ycp:209 +msgid "&Edit" +msgstr "" + +#: src/clients/suse_register_auto.ycp:210 +msgid "De&lete" +msgstr "" + #. progress step title #: src/clients/switch_scr_finish.ycp:42 msgid "Moving to installed system..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp --- old/yast2-installation-2.13.49/src/clients/inst_suse_register.ycp 2006-03-24 08:16:43.000000000 +0100 +++ new/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp 2006-03-28 20:19:33.000000000 +0200 @@ -46,11 +46,14 @@ map argmap = GetInstArgs::argmap(); /* strings for main (wizard) layout */ + + // Transltors: This is title/brand - only translate the Configuration string title_nccc = _("Novell Customer Center Configuration"); string title_update = _("Update Configuration"); // for SLES/SLED and SL (2 months after release) use title_nccc string title = title_update; + // Translators: limit to 2x 50 charachters - if more needed take 3x 50 chars but NOTHING more string nccc_top = _( "Get technical support and product updates and manage subscriptions with Novell Customer Center." @@ -94,12 +97,15 @@ string nonroot_title = _("Update Source Issues"); string nonroot_message = _( "Registering as a regular user does not include the update source -in YaST Online Update (YOU). To include the source automatically, -register as root. -Otherwise use other update tools or add the source to YOU manually." +in the Online Update YaST module. If you continue and later want +to update with Online Update, the source must be added manually. +Other tools, such as Software Updater in the panel, can still be +used. Alternatively, cancel then register through YaST as root +so the sources are available to all tools." ); + /* error messages */ string data_invalid = _("Error: Recieved data is invalid."); string retrieve_error = _("Error: Could not retrieve data."); @@ -202,8 +208,8 @@ /* vv MANUAL INTERACTION POPUP vv */ - term manual_interaction = `HBox( - `MinSize( 50, 20, `VBox( + term manual_interaction = //`HBox( + `MinSize( 65, 25, `HBox( `VBox( `Left( `Label( `opt(`boldFont), mi_required ) ) , `VSpacing(0.5) , `Left( `Label( mi_start_browser ) ) , @@ -503,6 +509,9 @@ { if ( configure_status == true ) { + // remove the zmd flag file (requested by mvidner) + SCR::Execute(.target.bash, " rm -f /var/lib/zypp/zmd_updated_the_sources " ); + /* run suse_register to see if we need manual interaction */ information_data = Register::suseRegister(nil); @@ -528,6 +537,7 @@ // now we launch the browser UI::ChangeWidget( `id(`needinfo), `Value, starting_browser ); launchBrowser(information_data["stdout"]:"http://www.opensuse.org"); + // FIXME: probably this line can be dropped - see FIXME below; drop with SP1 probably Register::submit_optional = false; // deactivate after each browser run } else if ( mi_ret == `cancel ) @@ -629,7 +639,8 @@ if (configure_status) UI::ChangeWidget(`id(`configure), `Value, true); else UI::ChangeWidget(`id(`noconfigure), `Value, true); - //FIXME: probably these two lines can be dropped if decided not to change these values after first suse_register call + //FIXME: probably these two lines can be dropped (see FIXME above as well) + // if decided not to change these values after first suse_register call; probably drop for SP1 UI::ChangeWidget( `id(`hwinfo ), `Value, Register::submit_hwdata ); UI::ChangeWidget( `id(`optional ), `Value, Register::submit_optional ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/src/clients/suse_register_auto.ycp new/yast2-installation-2.13.51/src/clients/suse_register_auto.ycp --- old/yast2-installation-2.13.49/src/clients/suse_register_auto.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.13.51/src/clients/suse_register_auto.ycp 2006-03-27 16:50:19.000000000 +0200 @@ -0,0 +1,416 @@ +/** + * File: suse_register_auto + * Module: Installation + * Summary: Configure Product Registration for Autoinstallation + * Authors: J. Daniel Schmidt <jdsn(a)suse.de> + * + * Configure Product Registration for Autoinstallation + * + * $Id: suse_register_auto.ycp 1 2006-03-27 13:20:02Z jdsn $ + */ + + +{ + +textdomain "installation"; + +import "Register"; +import "Wizard"; +import "Label"; +import "Progress"; +import "Report"; +import "Summary"; +import "Popup"; +import "String"; + + +/** + * Get all settings from the first parameter + * (For use by autoinstallation.) + * @param settings The YCP structure to be imported. + * @return boolean True on success + */ +boolean Import (map settings) +{ + y2debug("Import called, settings: %1", settings); + return Register::Import(settings); +} + + +/** + * Export the settings to a single map + * (For use by autoinstallation.) + */ + +map Export () +{ + y2debug("Export called"); + return Register::Export(); +} + + +/** + * Create a textual summary and a list of unconfigured cards + * @return summary of the current configuration + */ +string Summary() +{ + //Register::do_registration=false; + //Register::submit_optional=true; + //Register::submit_hwdata=true; + string summary = ""; + + // Translators: Heading - capitalized + summary = Summary::AddHeader (summary,_("Product Registration")); + // Translators: Text in a sentece-like environment - normal capitalization + summary = Summary::AddLine (summary, Register::do_registration ? _("Run during autoinstallation"):_("Do not run during autoinstallation")); + + integer items_count = size (Register::registration_data); + // Translators: Sentence-like text for singular and plural (incl. zero) of items + string items_msg = items_count == 1 ? _("1 item of registration data"):sformat(_("%1 items of registration data"), items_count); + + if ( Register::do_registration ) + { + summary = Summary::AddHeader (summary, _("Included Information") ); + summary = Summary::OpenList(summary); + // Translators: Text in a sentece-like environment - normal capitalization + summary = Summary::AddListItem (summary, Register::submit_hwdata ? _("Hardware profile"):""); + // Translators: Text in a sentece-like environment - normal capitalization + summary = Summary::AddListItem (summary,Register::submit_optional ? _("Optional information"):""); + summary = Summary::AddListItem (summary, items_msg ); + summary = Summary::CloseList(summary); + } + + return summary; +} + +/** + * Write all settings + * @return true on success + */ +boolean Write() +{ + return Register::Write(); +} + + +void Read() +{ + Register::Read(); +} + +map AutoPackages() +{ + return $[ "install":[], "remove":[] ]; +} + + + +/* --------------------------------------------------------- */ + + +/** + * Host edit dialog + * @param id id of the edited host + * @param entry edited entry + * @param forbidden already used IP addresses + * @return host or nil, if canceled + */ +define term KeyValueDialog(integer id, term entry) { + + y2debug("KeyValueDialog: id: %1", id); + y2debug("KeyValueDialog: entry: %1", entry); + + UI::OpenDialog(`opt(`decorated),`VBox( + `HSpacing(1), + `VBox( + /* TextEntry label */ + `TextEntry(`id(`key), _("&Key"), entry[1]:""), + /* TextEntry label */ + `TextEntry(`id(`value), _("&Value"), entry[2]:"") + ), + `HSpacing(1), + `HBox( + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) + ) + )); + + if(entry == `empty()) + UI::SetFocus(`id(`key)); + else + UI::SetFocus(`id(`value)); + + any ret = nil; + term newentry = nil; + + repeat + { + ret = UI::UserInput(); + if(ret != `ok) break; + + string key = (string) UI::QueryWidget(`id(`key), `Value); + string value = (string) UI::QueryWidget(`id(`value), `Value); + key = String::CutRegexMatch(key, "[^A-Za-z0-9_-]+", true ); + if (key == "") + { + Popup::Notify(_("Key is invalid.")); + UI::ChangeWidget(`id(`key), `Value, key); + ret=nil; + } + newentry = `item(`id(id), key, value); + + } until (ret == `ok || ret == `cancel); + + UI::CloseDialog(); + if(ret != `ok) return nil; + return newentry; +} + +/* --------------------------------------------------------- */ +/* --------------------------------------------------------- */ + + +symbol suse_register_configuration() +{ + string caption = _("Product Registration"); + string help_text_caption = sformat("%1", caption); + string help_text_para1 = _( +"Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select Run Product Registration. To simplify the procedure, include information from your system with Hardware Profile and Optional Information." +); + string help_text_para2 = _( +"Get more information about the registration process with <tt>suse_register -h</tt>." +); + string help_text_para3 = _( +"Other information used for registration is shown in Registration Data. Add a new key and value pair by pressing Add then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with Delete or modify an existing pair with Edit." +); + + string help_text = help_text_caption + help_text_para1 + help_text_para2 + help_text_para3; + + term contents = `VBox( + `VBox ( + // Translators: Text for UI Label - capitalized + `Left( `CheckBox(`id(`run), `opt(`notify), _("Run Product Registration"), false )), + `HBox( `HSpacing (3.0) , `VBox( + // Translators: Text for UI Label - capitalized + `Left( `Label( _("Include in Registration") ) ), + // Translators: Text for UI Label - capitalized + `Left( `CheckBox(`id(`sub_hw), `opt(`notify), _("Hardware Profile"), false )), + // Translators: Text for UI Label - capitalized + `Left( `CheckBox(`id(`sub_opt), `opt(`notify), _("Optional Information"), false )) + )) + ), + `VBox ( `VSpacing(0.5), + // Translators: Text for UI Label - capitalized + `Left( `Label( _("Registration Data to Use")) ), + `MinSize(10,5, `Table( `id(`table), `opt(`notify, `vstretch) , `header( _("Key"), _("Value")), [] )), + `HBox( + `PushButton(`id(`add), _("Ad&d")), + `PushButton(`id(`edit), `opt(`disabled), _("&Edit")), + `PushButton(`id(`delete), `opt(`disabled), _("De&lete")) + ), + `VSpacing(0.5) + ) + ); + + + Wizard::CreateDialog(); + Wizard::SetContents (caption, contents, help_text, false, true); + Wizard::SetNextButton(`next, Label::FinishButton() ); + + list<term> table_items=[]; + integer mycount=0; + // restore table items + foreach(string key, string value, Register::registration_data, + { + table_items = add(table_items, (term)`item(`id(mycount), key, value ) ); + mycount = mycount+1; + }); + + // get current changes + UI::ChangeWidget(`id(`table), `Items, table_items); + UI::ChangeWidget(`id(`run), `Value, Register::do_registration); + UI::ChangeWidget(`id(`sub_hw ), `Value, Register::submit_hwdata); + UI::ChangeWidget(`id(`sub_opt), `Value, Register::submit_optional); + integer items=size(table_items); + UI::ChangeWidget(`id(`edit), `Enabled, items > 0); + UI::ChangeWidget(`id(`delete), `Enabled, items > 0); + + symbol ret = nil; + + repeat + { + ret = (symbol)UI::UserInput(); + + if (ret == `run || ret == `sub_hw || ret == `sub_opt) + { + Register::do_registration = (boolean) UI::QueryWidget(`id(`run), `Value ); + Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`sub_hw), `Value); + Register::submit_optional = (boolean) UI::QueryWidget(`id(`sub_opt), `Value); + + y2debug("do_registration: %1", Register::do_registration); + y2debug("submit_hwdata: %1", Register::submit_hwdata); + y2debug("submit_optional: %1", Register::submit_optional); + } + else if (ret == `edit || ret == `table) + { + integer cur = (integer) UI::QueryWidget(`id(`table), `CurrentItem); + list<term> cur_item = filter(term e, table_items, { + return cur == e[0, 0]:nil; + }); + + term newitem = KeyValueDialog(cur, cur_item[0]:nil); + if (newitem == nil) continue; + else + { + table_items = maplist(term e, table_items, + { + if (cur == e[0,0]:-1) return newitem; + return e; + }); + } + + UI::ChangeWidget(`id(`table), `Items, table_items); + UI::ChangeWidget(`id(`table), `CurrentItem, cur); + + y2debug("cur: %1", cur); + y2debug("cur_item: %1", cur_item); + } + else if (ret == `add) + { + integer newid=items+1; + term newitem = KeyValueDialog(newid, `empty() ); + if (newitem == nil) continue; + else + { + table_items = add(table_items, newitem); + UI::ChangeWidget(`id(`table), `Items, table_items); + UI::ChangeWidget(`id(`table), `CurrentItem, newid); + } + y2debug("newitem: %1", newitem); + } + else if ( ret == `delete ) + { + integer cur = (integer) UI::QueryWidget(`id(`table), `CurrentItem); + + table_items = filter(term e, table_items, { + if (cur == e[0,0]:nil) return false; + return true; + }); + + y2debug("deleted from list item: %1", cur); + UI::ChangeWidget(`id(`table), `Items, table_items); + UI::ChangeWidget(`id(`table), `CurrentItem, cur-1 ); + } + else if ( ret == `abort || ret == `cancel ) + { + if(Popup::ReallyAbort(true)) break; + else continue; + } + + // refresh counter and buttons + items = size(table_items); + UI::ChangeWidget(`id(`edit), `Enabled, items > 0); + UI::ChangeWidget(`id(`delete), `Enabled, items > 0); + + } until (ret == `next || ret == `abort || ret == `back); + + + if (ret == `next) + { + Register::do_registration = (boolean) UI::QueryWidget(`id(`run), `Value); + Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`sub_hw), `Value); + Register::submit_optional = (boolean) UI::QueryWidget(`id(`sub_opt), `Value); + + Register::registration_data = $[]; + foreach(term e, table_items, { + Register::registration_data[e[1]:""] = e[2]:""; + }); + + y2debug("finish: wrote settings to global variables"); + y2debug("do_registration: %1", Register::do_registration); + y2debug("submit_hwdata: %1", Register::submit_hwdata); + y2debug("submit_optional: %1", Register::submit_optional); + y2debug("registration_data: %1", Register::registration_data); + } + + UI::CloseDialog(); + + return ret; +} + + + +//--------------------------------------------------------------------------- +// MAIN +//--------------------------------------------------------------------------- +y2milestone("----------------------------------------"); +y2milestone("suse_register_auto started"); + + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map) WFM::Args(1); +} + +y2milestone("func=%1", func); +y2milestone("param=%1", param); + +/* Create a summary*/ +if(func == "Summary") { + ret = Summary(); +} +/* Reset configuration */ +else if (func == "Reset") { + Import($[]); + ret = $[]; +} +/* Change configuration (run AutoSequence) */ +else if (func == "Change") { + ret = suse_register_configuration(); +} +/* Import configuration */ +else if (func == "Import") { + ret = Import(param); +} +/* Return actual state */ +else if (func == "Export") { + ret = Export(); +} +/* Return needed packages */ +else if (func == "Packages") { + ret = AutoPackages(); +} +/* Write given settings */ +else if (func == "Write") { + import "Progress"; + Progress::off(); + ret = Write(); + Progress::on(); +} +else if (func == "GetModified") { + ret = Register::autoYaSTModified; +} +else if (func == "SetModified") { + Register::autoYaSTModified = true; +} +/* Unknown function */ +else { + y2error("Unknown function: %1", func); + ret = false; +} + +y2milestone("ret=%1", ret); +y2milestone("suse_register_auto finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.49/src/modules/Register.ycp new/yast2-installation-2.13.51/src/modules/Register.ycp --- old/yast2-installation-2.13.49/src/modules/Register.ycp 2006-03-24 08:16:43.000000000 +0100 +++ new/yast2-installation-2.13.51/src/modules/Register.ycp 2006-03-27 16:30:47.000000000 +0200 @@ -26,12 +26,14 @@ // START: Globally defined data, access via Register::<variable> // -------------------------------------------------------------- -global boolean do_registration = true; +global boolean autoYaSTModified = false; +global boolean do_registration = false; global boolean iamroot = false; global boolean submit_optional = false; global boolean submit_hwdata = false; +global map<string, string> registration_data = $[]; // ------------------------------------------------------------------ // END: Globally defined data, access via Register::<variable> @@ -71,7 +73,7 @@ // check if we are root map<string, any> userid = (map<string, any>) SCR::Execute(.target.bash_output, "id -u"); y2milestone("running with user id %1", userid); - return String::FirstChunk(userid["stdout"]:"1", "\n") == "0" ? true:false; + return String::FirstChunk(userid["stdout"]:"1", "\n") == "0" ? true:false; } @@ -103,9 +105,9 @@ foreach (string line, splitstring ((string)SCR::Read(.target.string, home_config ),"\n"), { if ( regexpmatch(line, "^SUBMIT_OPTIONAL=\"[^\"]*\".*$") ) - submit_optional = regexpsub(line, "^SUBMIT_OPTIONAL=\"([^\"]*)\".*$", "\\1") == "true" ? true:false; + submit_optional = regexpsub(line, "^SUBMIT_OPTIONAL=\"([^\"]*)\".*$", "\\1") == "true" ? true:false; else if ( regexpmatch(line, "^SUBMIT_HWDATA=\"[^\"]*\".*$") ) - submit_hwdata = regexpsub(line, "^SUBMIT_HWDATA=\"([^\"]*)\".*$", "\\1") == "true" ? true:false; + submit_hwdata = regexpsub(line, "^SUBMIT_HWDATA=\"([^\"]*)\".*$", "\\1") == "true" ? true:false; }); } } @@ -170,6 +172,7 @@ */ global void finish() { + iamroot = amIroot(); write_config(); } @@ -190,13 +193,17 @@ if (parameter == `autoyast) { - //TODO: append values from map to the suse_register call - y2milestone ("called from autoyast"); + // append values from map to the suse_register call + foreach (string key, string val, registration_data, { + key = String::CutRegexMatch(key, "[^A-Za-z0-9_-]+", true ); + params = params + sformat(" -a %1='%2' ", key, String::Quote(val) ); + }); + y2milestone ("called from autoyast - added registration data to suse_register call"); } - if ( Mode::normal() ) params = params + " --force-registration "; - if ( submit_hwdata == false ) params = params + " --no-hw-data "; - if ( submit_optional == false ) params = params + " --no-optional "; + if ( Mode::normal() ) params = params + " --force-registration "; + if ( submit_hwdata == false ) params = params + " --no-hw-data "; + if ( submit_optional == false ) params = params + " --no-optional "; // run suse_register y2milestone ("Calling /usr/bin/suse_register %1", params); @@ -226,7 +233,7 @@ */ global void Read() { - y2milestone ("called Register::Read"); + initialize(); } @@ -235,29 +242,48 @@ */ global boolean Import(map settings) { + iamroot = amIroot(); + + submit_optional = false; + submit_hwdata = false; + do_registration = false; + registration_data = $[]; + + submit_optional = (boolean) settings["submit_optional"]:submit_optional; + submit_hwdata = (boolean) settings["submit_hwdata"]:submit_hwdata; + do_registration = (boolean) settings["do_registration"]:do_registration; + registration_data = (map<string, string>) settings["registration_data"]:$[]; + return true; } - -/** - * AutoYaST interface function: Export() - * @return map with the settings +/* + * Write() */ -global map Export() +global boolean Write() { - return $[]; + iamroot = amIroot(); + if (do_registration) suseRegister(`autoyast); + finish(); + return true; } + + /** - * AutoYaST interface function: Summary() - * @return summary string (html) + * AutoYaST interface function: Export() + * @return map with the settings */ -global string Summary() +global map Export() { - return ""; + return $[ + "submit_optional":submit_optional, + "submit_hwdata":submit_hwdata, + "do_registration":do_registration, + "registration_data":registration_data + ]; } - } // -EOF- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-storage
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package yast2-storage checked in at Tue Mar 28 20:48:30 CEST 2006. -------- --- /work/SRC/all/yast2-storage/yast2-storage.changes 2006-03-28 14:12:39.000000000 +0200 +++ /work/src/done/STABLE/yast2-storage/yast2-storage.changes 2006-03-28 19:50:03.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 28 19:49:50 CEST 2006 - fehr(a)suse.de + +- speed up detection of encryption type on large fs (#158950) +- version 2.13.40 + +------------------------------------------------------------------- @@ -5 +11 @@ -- add preliminary code to support xen devices (#151233) +- add code to support xen devices (#151233) Old: ---- yast2-storage-2.13.39.tar.bz2 New: ---- yast2-storage-2.13.40.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.8Irmqg/_old 2006-03-28 20:19:39.000000000 +0200 +++ /var/tmp/diff_new_pack.8Irmqg/_new 2006-03-28 20:19:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.13.39) +# spec file for package yast2-storage (Version 2.13.40) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.13.39 +Version: 2.13.40 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.13.39.tar.bz2 +Source0: yast2-storage-2.13.40.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.13.39 +%setup -n yast2-storage-2.13.40 %build %{prefix}/bin/y2tool y2autoconf @@ -165,8 +165,11 @@ %changelog -n yast2-storage * Tue Mar 28 2006 - fehr(a)suse.de +- speed up detection of encryption type on large fs (#158950) +- version 2.13.40 +* Tue Mar 28 2006 - fehr(a)suse.de - prevent endless loop when computing proposal (#161288) -- add preliminary code to support xen devices (#151233) +- add code to support xen devices (#151233) - version 2.13.39 * Mon Mar 27 2006 - fehr(a)suse.de - add script to create 65-cdrom.rules ++++++ yast2-storage-2.13.39.tar.bz2 -> yast2-storage-2.13.40.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.39/VERSION new/yast2-storage-2.13.40/VERSION --- old/yast2-storage-2.13.39/VERSION 2006-03-28 14:12:02.000000000 +0200 +++ new/yast2-storage-2.13.40/VERSION 2006-03-28 19:50:58.000000000 +0200 @@ -1 +1 @@ -2.13.39 +2.13.40 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.39/libstorage/src/Storage.cc new/yast2-storage-2.13.40/libstorage/src/Storage.cc --- old/yast2-storage-2.13.39/libstorage/src/Storage.cc 2006-03-28 13:49:20.000000000 +0200 +++ new/yast2-storage-2.13.40/libstorage/src/Storage.cc 2006-03-28 18:16:30.000000000 +0200 @@ -527,6 +527,7 @@ string::size_type p = dn.find_last_not_of( "0123456789" ); int nr = -1; dn.substr( p+1 ) >> nr; + dn.erase( p+1 ) >> nr; if( nr>=0 ) { Disk *d = new Disk( this, dn, (unsigned)nr, Size/2 ); @@ -3102,7 +3103,7 @@ { if( i!=vol.begin() ) b << " "; - b << (*i)->device(); + b << (*i)->mountDevice(); } b << "> "; y2milestone( "%s", b.str().c_str() ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.39/libstorage/src/SystemCmd.cc new/yast2-storage-2.13.40/libstorage/src/SystemCmd.cc --- old/yast2-storage-2.13.39/libstorage/src/SystemCmd.cc 2006-03-27 15:02:01.000000000 +0200 +++ new/yast2-storage-2.13.40/libstorage/src/SystemCmd.cc 2006-03-28 19:13:10.000000000 +0200 @@ -91,6 +91,69 @@ return( doExecute( Cmd_Cv )); } +int SystemCmd::executeRestricted( const string& Command_Cv, + long unsigned MaxTimeSec, + long unsigned MaxLineOut, + bool& ExceedTime, bool& ExceedLines ) + { + y2milestone( "cmd:%s MaxTime:%lu MaxLines:%lu", Command_Cv.c_str(), + MaxTimeSec, MaxLineOut ); + ExceedTime = ExceedLines = false; + int ret = executeBackground( Command_Cv ); + unsigned long ts = 0; + unsigned long ls = 0; + unsigned long start_time = time(NULL); + while( !ExceedTime && !ExceedLines && !doWait( false, ret ) ) + { + if( MaxTimeSec>0 ) + { + ts = time(NULL)-start_time; + y2mil( "time used:" << ts ); + } + if( MaxLineOut>0 ) + { + ls = numLines()+numLines(false,IDX_STDERR); + y2mil( "lines out:" << ls ); + } + ExceedTime = MaxTimeSec>0 && ts>MaxTimeSec; + ExceedLines = MaxLineOut>0 && ls>MaxLineOut; + sleep( 1 ); + } + if( ExceedTime || ExceedLines ) + { + int r = kill( Pid_i, SIGKILL ); + y2mil( "kill pid:" << Pid_i << " ret:" << r ); + unsigned count=0; + int Status_ii; + int Wait_ii = -1; + while( count<5 && Wait_ii<=0 ) + { + Wait_ii = waitpid( Pid_i, &Status_ii, WNOHANG ); + y2mil( "waitpid:" << Wait_ii ); + count++; + sleep( 1 ); + } + /* + r = kill( Pid_i, SIGKILL ); + y2mil( "kill pid:" << Pid_i << " ret:" << r ); + count=0; + waitDone = false; + while( count<8 && !waitDone ) + { + y2mil( "doWait:" << count ); + waitDone = doWait( false, ret ); + count++; + sleep( 1 ); + } + */ + Ret_i = -257; + } + y2milestone( "ret:%d ExceedTime:%d ExceedLines:%d", ret, ExceedTime, + ExceedLines ); + return( ret ); + } + + int SystemCmd::execute( const string& Cmd_Cv ) { @@ -526,10 +589,6 @@ { y2milestone( "pid:%d added lines:%zd stderr:%d", Pid_i, Lines_Cr.size()-old_size, Stderr_bv ); - if( Lines_Cr.size()>0 ) - { - y2mil( "last line:\"" << Lines_Cr.back() << '"' ); - } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.39/libstorage/src/SystemCmd.h new/yast2-storage-2.13.40/libstorage/src/SystemCmd.h --- old/yast2-storage-2.13.39/libstorage/src/SystemCmd.h 2005-12-06 19:00:28.000000000 +0100 +++ new/yast2-storage-2.13.40/libstorage/src/SystemCmd.h 2006-03-28 17:26:50.000000000 +0200 @@ -28,6 +28,10 @@ virtual ~SystemCmd(); int execute( const string& Command_Cv ); int executeBackground( const string& Command_Cv ); + int executeRestricted( const string& Command_Cv, + unsigned long MaxTimeSec, + unsigned long MaxLineOut, + bool& ExceedTime, bool& ExceedLines); void setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ); void logOutput(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.39/libstorage/src/Volume.cc new/yast2-storage-2.13.40/libstorage/src/Volume.cc --- old/yast2-storage-2.13.39/libstorage/src/Volume.cc 2006-03-21 14:19:29.000000000 +0100 +++ new/yast2-storage-2.13.40/libstorage/src/Volume.cc 2006-03-28 19:23:25.000000000 +0200 @@ -1302,7 +1302,8 @@ c.execute( "modprobe " + fs_names[detected_fs] ); c.execute( "mount -oro -t " + fsTypeString(detected_fs) + " " + loop_dev + " " + mpname ); - if( c.retcode()==0 ) + bool ok = c.retcode()==0; + if( ok ) { c.execute( "umount " + mpname ); string cmd; @@ -1310,7 +1311,7 @@ { case EXT2: case EXT3: - cmd = "fsck.ext2 -n -f " + loop_dev + " > /dev/null"; + cmd = "fsck.ext2 -n -f " + loop_dev; break; case REISERFS: cmd = "reiserfsck --yes --check -q " + loop_dev; @@ -1320,16 +1321,19 @@ " " + loop_dev; break; } - c.execute( cmd ); + bool excTime, excLines; + c.executeRestricted( cmd, 15, 500, excTime, excLines ); + ok = c.retcode()==0 || (excTime && !excLines); + y2milestone( "ok:%d retcode:%d excTime:%d excLines:%d", + ok, c.retcode(), excTime, excLines ); } - if( c.retcode()!=0 ) + if( !ok ) { detected_fs = fs = FSUNKNOWN; label.erase(); orig_label.erase(); uuid.erase(); } - c.execute( "umount " + mpname ); } } if( fs==FSUNKNOWN ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.39/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.13.40/storage/src/include/do_proposal_flexible.ycp --- old/yast2-storage-2.13.39/storage/src/include/do_proposal_flexible.ycp 2006-03-28 14:12:59.000000000 +0200 +++ new/yast2-storage-2.13.40/storage/src/include/do_proposal_flexible.ycp 2006-03-28 19:51:20.000000000 +0200 @@ -14,7 +14,7 @@ * ************************************************************* - $Id: do_proposal_flexible.ycp 29471 2006-03-28 12:12:50Z fehr $ + $Id: do_proposal_flexible.ycp 29485 2006-03-28 17:51:11Z fehr $ */ { @@ -1200,7 +1200,7 @@ ps[pindex,"size_max_cyl"]:0 > p[2]:0) { sum = sum + weights[index]:0; - y2milestone( "sum %1 wieght %2 pindex %3", sum, + y2milestone( "sum %1 weight %2 pindex %3", sum, weights[index]:0, pindex ); scount = scount+1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.39/storage/src/inst_custom_part.ycp new/yast2-storage-2.13.40/storage/src/inst_custom_part.ycp --- old/yast2-storage-2.13.39/storage/src/inst_custom_part.ycp 2006-03-15 16:25:01.000000000 +0100 +++ new/yast2-storage-2.13.40/storage/src/inst_custom_part.ycp 2006-03-28 15:18:16.000000000 +0200 @@ -26,7 +26,7 @@ * ************************************************************* - $Id: inst_custom_part.ycp 29008 2006-03-15 15:24:55Z fehr $ + $Id: inst_custom_part.ycp 29473 2006-03-28 13:18:12Z fehr $ */ { @@ -992,7 +992,8 @@ dev_start_cyl = " -- "; } - if( show_disk && + if( show_disk && + !(disk["type"]:`CT_UNKNOWN==`CT_DISK && !real_disk) && (disk["type"]:`CT_UNKNOWN==`CT_DISK || disk["type"]:`CT_UNKNOWN==`CT_LVM || (disk["type"]:`CT_UNKNOWN==`CT_EVMS && size(disk["name"]:"")>0 && diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.39/storage/src/modules/Storage.ycp new/yast2-storage-2.13.40/storage/src/modules/Storage.ycp --- old/yast2-storage-2.13.39/storage/src/modules/Storage.ycp 2006-03-23 14:01:33.000000000 +0100 +++ new/yast2-storage-2.13.40/storage/src/modules/Storage.ycp 2006-03-28 15:18:16.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht * "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen * näher erklärt. * - * $Id: Storage.ycp 29327 2006-03-23 13:01:30Z fehr $ + * $Id: Storage.ycp 29473 2006-03-28 13:18:12Z fehr $ */ { @@ -1323,6 +1323,13 @@ { map c = $[]; c = find( map p, conts, ``(p["device"]:""==device )); + if( c==nil ) + { + map tmp = GetDiskPartition( device ); + y2milestone( "getDiskInfo map %1", tmp ); + if( tmp["disk"]:"" != device ) + c = find( map p, conts, ``(p["device"]:""==tmp["disk"]:"" )); + } y2milestone( "getDiskInfo c:%1", c ); if( c!=nil ) { @@ -3234,7 +3241,9 @@ */ global define boolean IsRealDisk( map entry ) ``{ - return( entry["type"]:`CT_UNKNOWN==`CT_DISK ); + return( entry["type"]:`CT_UNKNOWN==`CT_DISK && + !(entry["type"]:`CT_UNKNOWN==`CT_DISK && entry["readonly"]:false && + entry["driver"]:""=="vbd") ); } global define boolean DeviceRealDisk( string device ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit limal-devtools
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package limal-devtools checked in at Tue Mar 28 18:36:41 CEST 2006. -------- --- /work/SRC/noarch/limal-devtools/limal-devtools.changes 2006-02-16 15:44:44.000000000 +0100 +++ /work/src/done/NOARCH/limal-devtools/limal-devtools.changes 2006-03-28 17:10:59.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 28 16:31:05 CEST 2006 - mt(a)suse.de + +- version 1.1.7 +- Bug #161342: changed to check for blocxx 1.0.0 + +------------------------------------------------------------------- Old: ---- limal-devtools-1.1.6.tar.bz2 New: ---- limal-devtools-1.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ limal-devtools.spec ++++++ --- /var/tmp/diff_new_pack.ekgnMz/_old 2006-03-28 18:36:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ekgnMz/_new 2006-03-28 18:36:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package limal-devtools (Version 1.1.6) +# spec file for package limal-devtools (Version 1.1.7) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,13 +12,13 @@ Name: limal-devtools URL: http://forge.novell.com/modules/xfmod/project/?limal -Version: 1.1.6 +Version: 1.1.7 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArchitectures: noarch -Source0: limal-devtools-1.1.6.tar.bz2 +Source0: limal-devtools-1.1.7.tar.bz2 prefix: /usr %define swiglibdir %(swig -swiglib) BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel swig @@ -48,7 +48,7 @@ Stefan Schubert <schubi(a)suse.de> %prep -%setup -n limal-devtools-1.1.6 +%setup -n limal-devtools-1.1.7 %build autoreconf --force --install @@ -84,6 +84,9 @@ %{swiglibdir}/perl5/_limal*.i %changelog -n limal-devtools +* Tue Mar 28 2006 - mt(a)suse.de +- version 1.1.7 +- Bug #161342: changed to check for blocxx 1.0.0 * Thu Feb 16 2006 - dsieben(a)suse.de - version 1.1.6 - add documentation of code indention tools for limal ++++++ limal-devtools-1.1.6.tar.bz2 -> limal-devtools-1.1.7.tar.bz2 ++++++ ++++ 10909 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-devtools-1.1.6/VERSION new/limal-devtools-1.1.7/VERSION --- old/limal-devtools-1.1.6/VERSION 2006-02-16 15:12:16.000000000 +0100 +++ new/limal-devtools-1.1.7/VERSION 2006-03-28 16:17:41.000000000 +0200 @@ -1 +1 @@ -1.1.6 +1.1.7 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-devtools-1.1.6/configure.in new/limal-devtools-1.1.7/configure.in --- old/limal-devtools-1.1.6/configure.in 2006-02-16 15:32:41.000000000 +0100 +++ new/limal-devtools-1.1.7/configure.in 2006-03-28 17:09:45.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by limalautoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(limal-devtools, 1.1.6, http://www.suse.de/feedback, limal-devtools) +AC_INIT(limal-devtools, 1.1.7, http://www.suse.de/feedback, limal-devtools) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important LiMaL variables -VERSION="1.1.6" +VERSION="1.1.7" RPMNAME="limal-devtools" RPMARCH="noarch" RPMLIB="devtools" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-devtools-1.1.6/devtools/bin/limalautoconf new/limal-devtools-1.1.7/devtools/bin/limalautoconf --- old/limal-devtools-1.1.6/devtools/bin/limalautoconf 2005-12-14 11:26:53.000000000 +0100 +++ new/limal-devtools-1.1.7/devtools/bin/limalautoconf 2006-03-28 16:56:49.000000000 +0200 @@ -31,7 +31,7 @@ # Jan Holesovsky <kendy(a)suse.cz>, 2001 # Michal Svec <msvec(a)suse.cz> # -# $Id: limalautoconf 1366 2005-12-14 10:24:49Z mt $ +# $Id: limalautoconf 1634 2006-03-28 14:56:48Z mt $ if ($#ARGV >= 0 && ($ARGV[0] eq "-h" || $ARGV[0] eq "--help")) { @@ -266,13 +266,13 @@ # check: BloCxx '@LIMAL-CHECKS-BLOCXX@' => 'dnl Check BloCxx installation -LIMAL_CHECK_BLOCXX([0.9.0]) +LIMAL_CHECK_BLOCXX([1.0.0]) ', # check: LiMaL (core) and blocxx large file check '@LIMAL-CHECKS-LIMAL@' => 'dnl Check BloCxx installation -LIMAL_CHECK_BLOCXX([0.9.0]) +LIMAL_CHECK_BLOCXX([1.0.0]) dnl Check LiMaL (core lib) installation LIMAL_CHECK_LIMAL([1.1.0]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-devtools-1.1.6/devtools/bin/version new/limal-devtools-1.1.7/devtools/bin/version --- old/limal-devtools-1.1.6/devtools/bin/version 2006-02-16 15:33:05.000000000 +0100 +++ new/limal-devtools-1.1.7/devtools/bin/version 2006-03-28 17:10:13.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -echo 1.1.6 +echo 1.1.7 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/limal-devtools-1.1.6/doc/blocxx_coding_guide.txt new/limal-devtools-1.1.7/doc/blocxx_coding_guide.txt --- old/limal-devtools-1.1.6/doc/blocxx_coding_guide.txt 2005-10-10 11:31:24.000000000 +0200 +++ new/limal-devtools-1.1.7/doc/blocxx_coding_guide.txt 2006-03-28 16:08:53.000000000 +0200 @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- -Don't use bool (or OpenWBEM::Bool) in parameter lists. It makes calling code +Don't use bool (or blocxx::Bool) in parameter lists. It makes calling code impossible to understand. Use an enum instead. e.g.: f(true, false, true, true); // what the hell is this doing? // I'll have to look up the function declaration to find out! @@ -38,21 +38,16 @@ values just to insert a new item in the middle. All classes and public identifiers (anything in a header) must be in namespace -OpenWBEM. If it's not meant for external use, such as internal implementation +blocxx. If it's not meant for external use, such as internal implementation details or variables local to a translation unit, then it should be put into an unnamed namespace to avoid possible duplicate symbol link-time errors. This can be a worse issue than you might think because of providers, all the -symbols are global and can possibly conflict with symbols from other providers -or the cimom. All file names begin with OW_, and try never to create 2 -files with the same name, because of the way gcc implements unnamed namespaces, -basically the namespace isn't really unnamed, it's named the same as the file, -so two files with the same names can have conflicts in the unnamed namespace. -Also, development headers all end up being installed into the same directory, -so 2 files cannot have the same name. +symbols are global and can possibly conflict with symbols from other libraries +or the application. Capitalize type and namespace names, but not other names. -All macros must begin with OW_. Macros should be #undef'd if they are not +All macros must begin with BLOCXX_. Macros should be #undef'd if they are not meant to be re-used. Please be aware of and follow the standard c++ naming rules about identifiers @@ -74,7 +69,7 @@ } Only do that in destructors. Never let an exception escape a destructor, if -it does, it will probably abort the cimom. +it does, it will probably abort the application. There may be other occasions where this is appropriate, such as in threads that need to keep running even though one iteration of it's work has failed. In this case, the ThreadCancelledException should *never* be caught: @@ -113,25 +108,16 @@ specification. Unfortunately gcc doesn't check, and so this can easily lead to problems. -Derive all new exceptions from OpenWBEM::Exception. In most cases, you can simply -use the OW_DECLARE_EXCEPTION and OW_DEFINE_EXCEPTION macros. +Derive all new exceptions from blocxx::Exception. In most cases, you can simply +use the BLOCXX_DECLARE_EXCEPTION and BLOCXX_DEFINE_EXCEPTION macros. -Use the OW_THROW macro to throw an exception, this will automatically pass in -the filename and line number, which is a great debugging help. +Use the BLOCXX_THROW macro or its variants to throw an exception; this will +automatically pass in the filename and line number, which is a great +debugging help. -Anytime you need to report a specific WBEM error (from CIM Operations over -HTTP), throw an OpenWBEM::CIMException. Use the OW_THROWCIM and OW_THROWCIMMSG -macros to do this. +Almost any function in BloCxx may throw a std::bad_alloc if memory is exhausted. +Keep this in mind when writing exception safe code. Almost anything can throw. -Almost any function in OW may throw a std::bad_alloc if memory is exhausted. -Keep this in mind when writing exception safe code. Almost anything can -throw. - ------------------------------------------------------------------------------ -The following CIM elements are case-insensitive: Classes, Instances, Methods, -Properties, Qualifiers and Method Parameters. -Namespaces in OpenWBEM are *NOT* case-insensitive. i.e. root/CIMV2 is a -different namespace than root/cimv2. ----------------------------------------------------------------------------- c++ namespaces. NEVER put "using namespace <x>;" in a header file. Avoid putting it in a cpp @@ -139,18 +125,13 @@ use the namespace: "std::cout << std::endl" or to name each item: using std::cout; using std::endl; -A few exceptions to the rule are OpenWBEM namespaces such as WBEMFlags. -This is because we can control what are in them and won't (shouldn't) break -things by introducing conflicting names. For other namespaces that are beyond -our control we should avoid importing wholesale, because it may introduce -identifier conflicts when porting or switching to another standard library. Use unnamed namespaces instead of static function/data. Try to put new code into a namespace, this is especially important for pluggable shared libaries like providers. Don't use a class with all static functions/data, instead use a namespace. -Put all library & cimom code into namespace OpenWBEM or a sub-namespace. +Put all library code into namespace blocxx or a sub-namespace. ----------------------------------------------------------------------------- If at all possible avoid static objects that have a constructor. These can lead to the dreaded "static initialization dependency order" problem. You're @@ -165,7 +146,7 @@ non-existent code (the destructor) will be run, resulting in a segfault. ----------------------------------------------------------------------------- memory & low-level C-style code: -The #1 rule in OpenWBEM is that you can't segfault or leak memory! This is +The #1 rule in blocxx is that you can't segfault or leak memory! This is typically associated with low-level C-style code, so #2 rule is that you can't write code like that unless you have a really good reason (no, optimization isn't a good enough reason, unless you've profiled it and it's using up >30% @@ -188,8 +169,8 @@ All files must have a copyright notice. ----------------------------------------------------------------------------- Header files must have a standard include guard, and it should be like this: -#ifndef OW_FILE_NAME_HPP_INCLUDE_GUARD_ -#define OW_FILE_NAME_HPP_INCLUDE_GUARD_ +#ifndef BLOCXX_FILE_NAME_HPP_INCLUDE_GUARD_ +#define BLOCXX_FILE_NAME_HPP_INCLUDE_GUARD_ //... #endif Use all caps and put underscores between words in the filename (where it would @@ -199,7 +180,7 @@ Note that identifiers containing __ are reserved for the standard c++ library, and MUST not be used in other code. ----------------------------------------------------------------------------- -All files must include "OW_config.h" as the first include file. +All files must include "BLOCXX_config.h" as the first include file. cpp files must include it's corresponding header file as the 2nd include file. ----------------------------------------------------------------------------- Try to minimize header dependencies as much as possible. Include the minimum @@ -214,8 +195,8 @@ The other extreme of creating a forward declaration header for each class isn't a good solution either because it's too much work to create and causes a proliferation of headers. -The method we use is to use one forward declaration header per directory -(or sub-set of classes. e.g. OW_CIMFwd.hpp). When adding a new class, add +The method we use is to use forward declaration headers for common classes +(e.g. CommonFwd.hpp and ArrayFwd.hpp). When adding a new class, add it to the appropriate forward declaration header. This way, each class is defined in exactly one place, and has only one forward declaration. When you need a forward declaration, simply include the appropriate header @@ -236,7 +217,7 @@ Define a class's invariant. Only functions that maintain or check the invariant belong in a class. Other functions belong outside the class as utility/helper functions. -Use OW_ASSERT macros to validate invariants and function pre-conditions. +Use BLOCXX_ASSERT macros to validate invariants and function pre-conditions. ----------------------------------------------------------------------------- Don't use spaces to indent the code. This is so you can set your tab spacing to your own liking in your editor. If it's all spaces, you're stuck @@ -292,11 +273,11 @@ ----------------------------------------------------------------------------- Testing. Before you modify or write any new code, make a test for it. There are 2 -types of tests in OpenWBEM: unit tests and acceptance tests. The unit tests +types of tests in BloCxx: unit tests and acceptance tests. The unit tests are under test/unit, and are organized by class. You can create a new test by running the newtest.sh script and passing in as the first argument the -classname. So if you're writing a new class called OpenWBEM::Foo, you'd put -it in OW_Foo.{hpp,cpp}, you'd run ./newtest Foo. Rename testSomething to be +classname. So if you're writing a new class called blocxx::Foo, you'd put +it in blocxx/Foo.{hpp,cpp}, you'd run ./newtest Foo. Rename testSomething to be something meaningful, and create a new test function (don't forget to add it to the suite) for each different type of functionality that you're going to test. There is also the acceptance test (also known as integration or system @@ -401,14 +382,14 @@ #ifdefs For porting to different platforms it's necessary to use preprocessor #if statements. We don't have any preference wrt whether you use #ifdef, -#if defined OW_FOO or #if defined(OW_FOO). +#if defined BLOCXX_FOO or #if defined(BLOCXX_FOO). If you are simply testing for the presense of a header, add a check to -configure.in and then use #ifdef OW_HAVE_HEADER_H. +configure.in and then use #ifdef BLOCXX_HAVE_HEADER_H. Also when using a non-portable function, test for it as well. In general try to test for features in configure.in and then #ifdef on the presense of the feature. Sometime this is pointless, as in the case of win32 threads which are completely different, so just a whole chunk of the file is -enclosed inside an #ifdef OW_WIN32. Also sometimes the build system does +enclosed inside an #ifdef BLOCXX_WIN32. Also sometimes the build system does the selection of code using automake conditionals. Try to minimize the number of #ifdefs. If possible create a facade so certain functionality is only ifdef'ed in one place instead of in 10 places @@ -536,8 +517,8 @@ <strstream> header. However the replacement (<sstream>) can't be used either (until we drop support for gcc 2.95.x) because it doesn't exist on - gcc 2.95.2. Use OW_StringStream.hpp, and if you need a iostream you'll have - to write one. + gcc 2.95.2. Use blocxx/StringStream.hpp, and if you need a iostream + you'll have to write one. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11-driver-video
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Tue Mar 28 18:36:17 CEST 2006. -------- --- /work/SRC/all/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-03-27 21:11:14.000000000 +0200 +++ /work/src/done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-03-28 12:55:31.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 28 13:00:07 CEST 2006 - sndirsch(a)suse.de + +- xorg-x11-ati-1_0_branch-060327.diff + * fixed loading of DRM module + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.xpYNje/_old 2006-03-28 18:36:11.000000000 +0200 +++ /var/tmp/diff_new_pack.xpYNje/_new 2006-03-28 18:36:11.000000000 +0200 @@ -20,7 +20,7 @@ Group: System/X11/Servers/XF86_4 Autoreqprov: on Version: 6.9.0 -Release: 31 +Release: 32 Summary: Various X.Org video drivers Requires: xorg-x11-server Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/drivers/sis_drv.o @@ -300,6 +300,9 @@ %endif %changelog -n xorg-x11-driver-video +* Tue Mar 28 2006 - sndirsch(a)suse.de +- xorg-x11-ati-1_0_branch-060327.diff + * fixed loading of DRM module * Mon Mar 27 2006 - sndirsch(a)suse.de - rn50_init_crtc_regs.diff: * enables VGA rear output on Dell machines (Bug #147070) ++++++ xorg-x11-ati-1_0_branch-060327.diff ++++++ --- /var/tmp/diff_new_pack.xpYNje/_old 2006-03-28 18:36:11.000000000 +0200 +++ /var/tmp/diff_new_pack.xpYNje/_new 2006-03-28 18:36:11.000000000 +0200 @@ -201,3 +201,23 @@ #define RADEON_IDLE_RETRY 16 /* Fall out of idle loops after this count */ #define RADEON_TIMEOUT 2000000 /* Fall out of wait loops after this count */ #define RADEON_MMIOSIZE 0x80000 +--- radeon_dri.c.old 2006-03-28 10:56:24.000000000 +0000 ++++ radeon_dri.c 2006-03-28 10:58:22.000000000 +0000 +@@ -1268,7 +1268,7 @@ + } + + /* Low level DRM open */ +- fd = drmOpen(RADEON_DRIVER_NAME, busId); ++ fd = drmOpen("radeon", busId); + xfree(busId); + if (fd < 0) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, +@@ -1367,7 +1367,7 @@ + if (!(pDRIInfo = DRICreateInfoRec())) return FALSE; + + info->pDRIInfo = pDRIInfo; +- pDRIInfo->drmDriverName = RADEON_DRIVER_NAME; ++ pDRIInfo->drmDriverName = "radeon"; + + if ( (info->ChipFamily >= CHIP_FAMILY_R300) ) { + pDRIInfo->clientDriverName = R300_DRIVER_NAME; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit koffice-i18n
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package koffice-i18n checked in at Tue Mar 28 18:36:15 CEST 2006. -------- --- /work/SRC/noarch/KDE/koffice-i18n/koffice-i18n.changes 2006-02-26 11:29:51.000000000 +0100 +++ /work/src/done/NOARCH/koffice-i18n/koffice-i18n.changes 2006-03-28 17:53:56.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 17:53:19 CEST 2006 - stbinner(a)suse.de + +- make sr@Latn package provide locale "sr" instead of "srLatn" + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice-i18n.spec ++++++ --- /var/tmp/diff_new_pack.hbS3Mi/_old 2006-03-28 18:35:13.000000000 +0200 +++ /var/tmp/diff_new_pack.hbS3Mi/_new 2006-03-28 18:35:13.000000000 +0200 @@ -18,7 +18,7 @@ Group: System/GUI/KDE Summary: Translations for KDE Applications Version: 1.4.2 -Release: 5 +Release: 6 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Source0: koffice-l10n-bg-%version.tar.bz2 @@ -401,7 +401,7 @@ %package srLatn Summary: Serbian translations for KOffice Group: System/GUI/KDE -Provides: koffice-l10n-srLatn locale(koffice:srLatn) +Provides: koffice-l10n-srLatn locale(koffice:sr) %description srLatn Serbian translations for KOffice @@ -578,6 +578,8 @@ #@FILES@ %changelog -n koffice-i18n +* Tue Mar 28 2006 - stbinner(a)suse.de +- make sr@Latn package provide locale "sr" instead of "srLatn" * Sun Feb 26 2006 - schwab(a)suse.de - Clean up BuildRequires. * Sun Feb 26 2006 - aj(a)suse.de ++++++ pre_checkin.sh ++++++ --- /work/SRC/noarch/KDE/koffice-i18n/pre_checkin.sh 2006-02-26 11:29:49.000000000 +0100 +++ /work/src/done/NOARCH/koffice-i18n/pre_checkin.sh 2006-03-28 17:52:47.000000000 +0200 @@ -12,11 +12,13 @@ sed -e "s,#@SOURCES@,Source$nr: koffice-l10n-$lang-%version.tar.bz2\n#@SOURCES@," koffice-i18n.spec > koffice-i18n.spec.tmp && mv koffice-i18n.spec.tmp koffice-i18n.spec + plang=$lang if test "$lang" = "sr@Latn"; then lang=srLatn + plang=sr fi - text="%package $lang\nSummary:$lang\nGroup:System/GUI/KDE\nProvides:koffice-l10n-$lang locale(koffice:$lang)\n%description $lang\n$lang\n" + text="%package $lang\nSummary:$lang\nGroup:System/GUI/KDE\nProvides:koffice-l10n-$lang locale(koffice:$plang)\n%description $lang\n$lang\n" sed -e "s,#@PACKAGES@,$text\n#@PACKAGES@," koffice-i18n.spec > koffice-i18n.spec.tmp && mv koffice-i18n.spec.tmp koffice-i18n.spec sed -e "s,#@FILES@,%files $lang -f ../files.$lang\n#@FILES@," koffice-i18n.spec > koffice-i18n.spec.tmp && mv koffice-i18n.spec.tmp koffice-i18n.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pvm
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package pvm checked in at Tue Mar 28 18:35:14 CEST 2006. -------- --- /work/SRC/all/pvm/pvm.changes 2006-01-25 21:40:42.000000000 +0100 +++ /work/src/done/STABLE/pvm/pvm.changes 2006-03-22 18:47:02.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 22 18:19:15 CET 2006 - mrueckert(a)suse.de + +- added pvm-3.4.5_missing_format_param.patch + o fixes missing parameter for printf expression. (#133904) + o use vsnprintf instead of vsprintf + +------------------------------------------------------------------- New: ---- pvm-3.4.5_missing_format_param.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pvm.spec ++++++ --- /var/tmp/diff_new_pack.ezkJvQ/_old 2006-03-28 18:34:53.000000000 +0200 +++ /var/tmp/diff_new_pack.ezkJvQ/_new 2006-03-28 18:34:53.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,7 +14,7 @@ BuildRequires: gcc-fortran readline-devel tcsh Summary: Parallel Virtual Machine Version: 3.4.5 -Release: 9 +Release: 16 License: LGPL, Other License(s), see package Group: Development/Libraries/Parallel Source0: ftp://ftp.netlib.org/pvm3/%{name}-%{version}.tar.bz2 @@ -23,6 +23,7 @@ Patch1: pvm-%{version}-cons.patch Patch2: pvm-%{version}-gcc4.patch Patch3: pvm-3.4.5_missing_includes.patch +Patch4: pvm-3.4.5_missing_format_param.patch URL: http://www.epm.ornl.gov/pvm/pvm_home.html BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _pvm_root /usr/lib/pvm3 @@ -151,6 +152,7 @@ %patch1 %patch2 -p1 %patch3 +%patch4 %build mkdir -p src/%{_pvm_arch} @@ -239,6 +241,10 @@ %{_mandir}/man3/* %changelog -n pvm +* Wed Mar 22 2006 - mrueckert(a)suse.de +- added pvm-3.4.5_missing_format_param.patch + o fixes missing parameter for printf expression. (#133904) + o use vsnprintf instead of vsprintf * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jan 23 2006 - mrueckert(a)suse.de ++++++ pvm-3.4.5_missing_format_param.patch ++++++ Index: src/pvmlog.c =================================================================== --- src/pvmlog.c.orig +++ src/pvmlog.c @@ -348,7 +348,8 @@ char *fmt; va_list ap; { - char vtmp[255]; + size_t vlen = 255; + char vtmp[vlen]; int cnt = 0; int cc; @@ -362,7 +363,7 @@ /* snag var arg string, in case re-use whacks it... */ /* (thank you very much x86_64... :-Q */ - vsprintf(vtmp, fmt, ap); + vsnprintf(vtmp, vlen, fmt, ap); if (log_how & 1) { if (atnewline) { @@ -488,7 +489,7 @@ pvmlogprintf("em=0x%lx\n", (long) em); for (i=0; i < 10 ; i++ ) - pvmlogprintf("[%x/%c]", em[i]); + pvmlogprintf("[%x/%c]", em[i], em[i]); pvmlogprintf("\n"); pvmlogprintf("%s: %s\n", s, em); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-packager
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package yast2-packager checked in at Tue Mar 28 18:34:42 CEST 2006. -------- --- /work/SRC/all/yast2-packager/yast2-packager.changes 2006-03-28 12:53:17.000000000 +0200 +++ /work/src/done/STABLE/yast2-packager/yast2-packager.changes 2006-03-28 17:43:06.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Mar 28 17:42:20 CEST 2006 - locilka(a)suse.cz + +- Added the first implementation of SignatureCheckDialogs module. +- 2.13.54 + +------------------------------------------------------------------- +Tue Mar 28 14:10:29 CEST 2006 - visnov(a)suse.cz + +- Show type of installation source if name is not known + +------------------------------------------------------------------- +Tue Mar 28 13:41:20 CEST 2006 - locilka(a)suse.cz + +- Moving ZMD sync to the pkg_finish client that is called after the + switch_scr client (#161299). + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.53.tar.bz2 New: ---- yast2-packager-2.13.54.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.xwU2sG/_old 2006-03-28 18:34:22.000000000 +0200 +++ /var/tmp/diff_new_pack.xwU2sG/_new 2006-03-28 18:34:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.53) +# spec file for package yast2-packager (Version 2.13.54) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.53 +Version: 2.13.54 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.53.tar.bz2 +Source0: yast2-packager-2.13.54.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -41,7 +41,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.53 +%setup -n yast2-packager-2.13.54 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,14 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Tue Mar 28 2006 - locilka(a)suse.cz +- Added the first implementation of SignatureCheckDialogs module. +- 2.13.54 +* Tue Mar 28 2006 - visnov(a)suse.cz +- Show type of installation source if name is not known +* Tue Mar 28 2006 - locilka(a)suse.cz +- Moving ZMD sync to the pkg_finish client that is called after the + switch_scr client (#161299). * Tue Mar 28 2006 - visnov(a)suse.cz - fix slideshow in 1st stage (#154324) - 2.13.53 ++++++ yast2-packager-2.13.53.tar.bz2 -> yast2-packager-2.13.54.tar.bz2 ++++++ ++++ 3256 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.53/Makefile.am new/yast2-packager-2.13.54/Makefile.am --- old/yast2-packager-2.13.53/Makefile.am 2006-03-13 14:18:11.000000000 +0100 +++ new/yast2-packager-2.13.54/Makefile.am 2006-03-28 17:45:50.000000000 +0200 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,6 +199,9 @@ false; \ fi +check-textdomain: + $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.53/VERSION new/yast2-packager-2.13.54/VERSION --- old/yast2-packager-2.13.53/VERSION 2006-03-28 11:36:19.000000000 +0200 +++ new/yast2-packager-2.13.54/VERSION 2006-03-28 13:41:14.000000000 +0200 @@ -1 +1 @@ -2.13.53 +2.13.54 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.53/configure.in new/yast2-packager-2.13.54/configure.in --- old/yast2-packager-2.13.53/configure.in 2006-03-13 14:18:11.000000000 +0100 +++ new/yast2-packager-2.13.54/configure.in 2006-03-28 17:45:50.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.41, http://www.suse.de/feedback, yast2-packager) +AC_INIT(yast2-packager, 2.13.54, http://www.suse.de/feedback, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.41" +VERSION="2.13.54" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.53/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.54/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.13.53/src/clients/inst_rpmcopy.ycp 2006-03-28 11:32:23.000000000 +0200 +++ new/yast2-packager-2.13.54/src/clients/inst_rpmcopy.ycp 2006-03-28 13:42:10.000000000 +0200 @@ -13,7 +13,7 @@ * Packages module : * "installed" * - * $Id: inst_rpmcopy.ycp 29429 2006-03-27 14:28:35Z locilka $ + * $Id: inst_rpmcopy.ycp 29461 2006-03-28 11:42:01Z locilka $ */ { @@ -34,7 +34,6 @@ import "Report"; import "Kernel"; import "Service"; - import "Message"; // variables related to installation source caching @@ -500,162 +499,6 @@ // end of installation source caching functions // ------------------------------------------------------------------------------------------------------ - // ------------------------------------------------------------------------------------------------------ - // adding YaST installation source into the ZMD - - /** - * Runs a bash command with timeout. - * @struct Returns map $[ - * "exit" : int_return_code, - * "stdout" : [ "script", "stdout", "lines" ], - * "stderr" : [ "script", "stderr", "lines" ], - * ] - * - * @param string command - * @param integer timeout in sec. - * @return map with out, err and ret_code - */ - map RunCommandWithTimeout (string run_command, integer script_time_out) { - y2milestone("Running command \"%1\" in background...", run_command); - - boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command); - if (!started) { - y2error("Cannot run '%1'", run_command); - return nil; - } - - list<string> script_out = []; - list<string> script_err = []; - integer time_spent = 0; - integer return_code = nil; - boolean cont_loop = true; - integer sleep_step = 20; - script_time_out = script_time_out * 1000; - - // while continuing is needed and while it is possible - while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) { - // time-out - if (time_spent >= script_time_out) { - y2error("Command '%1' timed-out after %2 mces", run_command, time_spent); - cont_loop = false; - } - - time_spent = time_spent + sleep_step; - sleep(sleep_step); - } - y2milestone("Time spent: %1 msec", time_spent); - - // fetching the return code if not timed-out - if (cont_loop) { - script_out = (list<string>) SCR::Read(.background.newout); - script_err = (list<string>) SCR::Read(.background.newerr); - return_code = (integer) SCR::Read(.background.status); - } - SCR::Execute(.background.kill, ""); - - map command_ret = $[ - "exit" : return_code, - "stdout" : script_out, - "stderr" : script_err, - ]; - return command_ret; - } - - /** - * Returns count of services matching the pattern. Returns 'nil' - * if something fails. - * - * @param string grep_pattern to match the ZYPP service - * @return integer count of matching lines - */ - integer CountOfZMDServicesMatching (string grep_pattern) { - map ret = RunCommandWithTimeout( - sformat("TERM=dumb /usr/bin/rug service-list; exit $?"), - 60 - ); - if (ret != nil && ret["stdout"]:nil != nil) { - list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], { - return regexpmatch(one_line, grep_pattern); - }); - return size(matching); - } else { - y2error("Counting of services failed, returned %1", ret); - return nil; - } - } - - /* Adds a ZYPP service into ZMD */ - boolean AddZYPPServiceIntoZMD () { - map ret = RunCommandWithTimeout( - "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?", - 60 - ); - if (ret != nil && ret["exit"]:nil == 0) { - return true; - } else { - y2error("Adding ZYPP service failed, returned %1", ret); - return false; - } - } - - /** - * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed - * in the ZMD services, adds one if it is missing. - * Everything is done via the .background agent with timeout (number in seconds). - */ - boolean SyncYaSTInstSourceWithZMD () { - // Notes for maintainer: - // - using .background agent because of ZMD/rug call that can stuck - // - using 'exit $?' that work well with ZMD/rug and .background together - // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug - - y2milestone("--- Syncing YaST inst source with ZMD ---"); - string zmd_service_name = "/etc/init.d/novell-zmd"; - string rug_command = "/usr/bin/rug"; - - // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD' - map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); - y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); - if (zmd_status == nil || zmd_status["exit"]:nil != 0) { - // Starting the service - map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60); - y2milestone("ZMD start: %1", zmd_start); - // Checking the status after start - map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); - y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); - if (zmd_status == nil || zmd_status["exit"]:nil != 0) { - Report::Error(Message::CannotStartService(zmd_service_name)); - y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status); - y2milestone("--- Syncing finished ---"); - return false; - } - } - - // Check whether the ZYPP service is already in zmd db or not - integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*"); - if (count_of_services == nil) { - y2warning("Cannot get list of services..."); - } else if (count_of_services > 0) { - y2milestone("ZYPP service already presented (%1)", count_of_services); - y2milestone("--- Syncing finished ---"); - return true; - } - - // Count of services were 'nil' or '0' - if (AddZYPPServiceIntoZMD()) { - y2milestone("Adding ZYPP service succeeded"); - } else { - Report::Error(Message::CannotWriteSettingsTo("ZMD")); - y2error("Adding ZYPP service failed"); - } - - y2milestone("--- Syncing finished ---"); - return true; - } - - // adding YaST installation source into the ZMD - // ------------------------------------------------------------------------------------------------------ - Pkg::SetLocale (Language::language); SlideShow::SetLanguage (Language::language); @@ -937,10 +780,5 @@ } } - // Bug 156030 - YaST installation sources must be synced with ZMD - UI::OpenDialog(`Label(_("Configuring installed system") + "...")); - boolean sync_ret = SyncYaSTInstSourceWithZMD(); - UI::CloseDialog(); - return result; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.53/src/clients/pkg_finish.ycp new/yast2-packager-2.13.54/src/clients/pkg_finish.ycp --- old/yast2-packager-2.13.53/src/clients/pkg_finish.ycp 2006-02-14 07:29:56.000000000 +0100 +++ new/yast2-packager-2.13.54/src/clients/pkg_finish.ycp 2006-03-28 13:42:10.000000000 +0200 @@ -7,8 +7,9 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: pkg_finish.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: pkg_finish.ycp 29461 2006-03-28 11:42:01Z locilka $ * */ @@ -17,11 +18,169 @@ textdomain "packager"; import "Installation"; +import "Report"; +import "Message"; any ret = nil; string func = ""; map param = $[]; + // ------------------------------------------------------------------------------------------------------ + // adding YaST installation source into the ZMD + + /** + * Runs a bash command with timeout. + * @struct Returns map $[ + * "exit" : int_return_code, + * "stdout" : [ "script", "stdout", "lines" ], + * "stderr" : [ "script", "stderr", "lines" ], + * ] + * + * @param string command + * @param integer timeout in sec. + * @return map with out, err and ret_code + */ + map RunCommandWithTimeout (string run_command, integer script_time_out) { + y2milestone("Running command \"%1\" in background...", run_command); + + boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command); + if (!started) { + y2error("Cannot run '%1'", run_command); + return nil; + } + + list<string> script_out = []; + list<string> script_err = []; + integer time_spent = 0; + integer return_code = nil; + boolean cont_loop = true; + integer sleep_step = 20; + script_time_out = script_time_out * 1000; + + // while continuing is needed and while it is possible + while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) { + // time-out + if (time_spent >= script_time_out) { + y2error("Command '%1' timed-out after %2 mces", run_command, time_spent); + cont_loop = false; + } + + time_spent = time_spent + sleep_step; + sleep(sleep_step); + } + y2milestone("Time spent: %1 msec", time_spent); + + // fetching the return code if not timed-out + if (cont_loop) { + script_out = (list<string>) SCR::Read(.background.newout); + script_err = (list<string>) SCR::Read(.background.newerr); + return_code = (integer) SCR::Read(.background.status); + } + SCR::Execute(.background.kill, ""); + + map command_ret = $[ + "exit" : return_code, + "stdout" : script_out, + "stderr" : script_err, + ]; + return command_ret; + } + + /** + * Returns count of services matching the pattern. Returns 'nil' + * if something fails. + * + * @param string grep_pattern to match the ZYPP service + * @return integer count of matching lines + */ + integer CountOfZMDServicesMatching (string grep_pattern) { + map ret = RunCommandWithTimeout( + sformat("TERM=dumb /usr/bin/rug service-list; exit $?"), + 60 + ); + if (ret != nil && ret["stdout"]:nil != nil) { + list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], { + return regexpmatch(one_line, grep_pattern); + }); + return size(matching); + } else { + y2error("Counting of services failed, returned %1", ret); + return nil; + } + } + + /* Adds a ZYPP service into ZMD */ + boolean AddZYPPServiceIntoZMD () { + map ret = RunCommandWithTimeout( + "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?", + 60 + ); + if (ret != nil && ret["exit"]:nil == 0) { + return true; + } else { + y2error("Adding ZYPP service failed, returned %1", ret); + return false; + } + } + + /** + * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed + * in the ZMD services, adds one if it is missing. + * Everything is done via the .background agent with timeout (number in seconds). + */ + boolean SyncYaSTInstSourceWithZMD () { + // Notes for maintainer: + // - using .background agent because of ZMD/rug call that can stuck + // - using 'exit $?' that work well with ZMD/rug and .background together + // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug + + y2milestone("--- Syncing YaST inst source with ZMD ---"); + string zmd_service_name = "/etc/init.d/novell-zmd"; + string rug_command = "/usr/bin/rug"; + + // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD' + map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); + y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); + if (zmd_status == nil || zmd_status["exit"]:nil != 0) { + // Starting the service + map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60); + y2milestone("ZMD start: %1", zmd_start); + // Checking the status after start + map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); + y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); + if (zmd_status == nil || zmd_status["exit"]:nil != 0) { + Report::Error(Message::CannotStartService(zmd_service_name)); + y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status); + y2milestone("--- Syncing finished ---"); + return false; + } + } + + // Check whether the ZYPP service is already in zmd db or not + integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*"); + if (count_of_services == nil) { + y2warning("Cannot get list of services..."); + } else if (count_of_services > 0) { + y2milestone("ZYPP service already presented (%1)", count_of_services); + y2milestone("--- Syncing finished ---"); + return true; + } + + // Count of services were 'nil' or '0' + if (AddZYPPServiceIntoZMD()) { + y2milestone("Adding ZYPP service succeeded"); + } else { + Report::Error(Message::CannotWriteSettingsTo("ZMD")); + y2error("Adding ZYPP service failed"); + } + + y2milestone("--- Syncing finished ---"); + return true; + } + + // adding YaST installation source into the ZMD + // ------------------------------------------------------------------------------------------------------ + /* Check arguments */ if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { func = (string)WFM::Args(0); @@ -44,6 +203,9 @@ } else if (func == "Write") { + // Bug 156030 + 161299 - YaST installation sources must be synced with ZMD + boolean sync_ret = SyncYaSTInstSourceWithZMD(); + Pkg::SourceCacheCopyTo (Installation::destdir); // disable all sources and finish target diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.53/src/clients/test.ycp new/yast2-packager-2.13.54/src/clients/test.ycp --- old/yast2-packager-2.13.53/src/clients/test.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.54/src/clients/test.ycp 2006-03-27 15:55:00.000000000 +0200 @@ -0,0 +1,156 @@ +{ + textdomain "packager"; + import "Service"; + import "Message"; + + /** + * Runs a bash command with timeout. + * @struct Returns map $[ + * "exit" : int_return_code, + * "stdout" : [ "script", "stdout", "lines" ], + * "stderr" : [ "script", "stderr", "lines" ], + * ] + * + * @param string command + * @param integer timeout in sec. + * @return map with out, err and ret_code + */ + map RunCommandWithTimeout (string run_command, integer script_time_out) { + y2milestone("Running command \"%1\" in background...", run_command); + + boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command); + if (!started) { + y2error("Cannot run '%1'", run_command); + return nil; + } + + list<string> script_out = []; + list<string> script_err = []; + integer time_spent = 0; + integer return_code = nil; + boolean cont_loop = true; + integer sleep_step = 20; + script_time_out = script_time_out * 1000; + + // while continuing is needed and while it is possible + while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) { + // time-out + if (time_spent >= script_time_out) { + y2error("Command '%1' timed-out after %2 mces", run_command, time_spent); + cont_loop = false; + } + + time_spent = time_spent + sleep_step; + sleep(sleep_step); + } + y2milestone("Time spent: %1 msec", time_spent); + + // fetching the return code if not timed-out + if (cont_loop) { + script_out = (list<string>) SCR::Read(.background.newout); + script_err = (list<string>) SCR::Read(.background.newerr); + return_code = (integer) SCR::Read(.background.status); + } + SCR::Execute(.background.kill, ""); + + map command_ret = $[ + "exit" : return_code, + "stdout" : script_out, + "stderr" : script_err, + ]; + return command_ret; + } + + /** + * Returns count of services matching the pattern. Returns 'nil' + * if something fails. + * + * @param string grep_pattern to match the ZYPP service + * @return integer count of matching lines + */ + integer CountOfZMDServicesMatching (string grep_pattern) { + map ret = RunCommandWithTimeout( + sformat("TERM=dumb /usr/bin/rug service-list; exit $?"), + 60 + ); + if (ret != nil && ret["stdout"]:nil != nil) { + list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], { + return regexpmatch(one_line, grep_pattern); + }); + return size(matching); + } else { + y2error("Counting of services failed, returned %1", ret); + return nil; + } + } + + /* Adds a ZYPP service into ZMD */ + boolean AddZYPPServiceIntoZMD () { + map ret = RunCommandWithTimeout( + "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?", + 60 + ); + if (ret != nil && ret["exit"]:nil == 0) { + return true; + } else { + y2error("Adding ZYPP service failed, returned %1", ret); + return false; + } + } + + /** + * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed + * in the ZMD services, adds one if it is missing. + * Everything is done via the .background agent with timeout (number in seconds). + */ + boolean SyncYaSTInstSourceWithZMD () { + // Notes for maintainer: + // - using .background agent because of ZMD/rug call that can stuck + // - using 'exit $?' that work well with ZMD/rug and .background together + // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug + + y2milestone("--- Syncing YaST inst source with ZMD ---"); + string zmd_service_name = "/etc/init.d/novell-zmd"; + string rug_command = "/usr/bin/rug"; + + // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD' + map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); + y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); + if (zmd_status == nil || zmd_status["exit"]:nil != 0) { + // Starting the service + map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60); + y2milestone("ZMD start: %1", zmd_start); + // Checking the status after start + map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); + y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); + if (zmd_status == nil || zmd_status["exit"]:nil != 0) { + Message::CannotStartService(zmd_service_name); + y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status); + y2milestone("--- Syncing finished ---"); + return false; + } + } + + // Check whether the ZYPP service is already in zmd db or not + integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*"); + if (count_of_services == nil) { + y2warning("Cannot get list of services..."); + } else if (count_of_services > 0) { + y2milestone("ZYPP service already presented (%1)", count_of_services); + y2milestone("--- Syncing finished ---"); + return true; + } + + // Count of services were 'nil' or '0' + if (AddZYPPServiceIntoZMD()) { + y2milestone("Adding ZYPP service succeeded"); + } else { + y2error("Adding ZYPP service failed"); + } + + y2milestone("--- Syncing finished ---"); + return true; + } + + SyncYaSTInstSourceWithZMD(); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.53/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp --- old/yast2-packager-2.13.53/src/modules/SignatureCheckDialogs.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp 2006-03-28 17:31:05.000000000 +0200 @@ -0,0 +1,387 @@ +/** + * Module: SignatureCheckDialogs.ycp + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * Dialogs handling for RPM/Source GPM signatures. + * + * $Id: SignatureCheckDialogs.ycp 28363 2006-02-24 12:27:15Z locilka $ + */ + +{ + textdomain "packager"; + + module "SignatureCheckDialogs"; + + import "Label"; + import "Popup"; + + // Defining icons for dialogs + term error_icon = `Empty(); + term warning_icon = `Empty(); + term question_icon = `Empty(); + +// TODO: support icons +// /** +// * Module constructor +// */ +// global void InitDialogs () { +// map ui_capabilities = UI::GetDisplayInfo(); +// if (ui_capabilities["HasLocalImageSupport"]:false) { +// error_icon = `HBox(`Image("error", ""), `HSpacing(1)); +// warning_icon = `HBox(`Image("warning", ""), `HSpacing(1)); +// question_icon = `HBox(`Image("question", ""), `HSpacing(1)); +// } +// } + + /** + * Returns term of yes/no buttons + * + * @param symbol default button `yes or `no + * @return term with buttons + */ + term YesNoButtons (symbol default_button) { + term yes_button = `PushButton(`id(`yes), Label::YesButton()); + term no_button = `PushButton(`id(`no), Label::NoButton()); + + if (default_button == `yes) { + yes_button = `PushButton(`id(`yes), `opt(`default), Label::YesButton()); + } else { + no_button = `PushButton(`id(`no), `opt(`default), Label::NoButton()); + } + + return `HBox ( + yes_button, + `HSpacing(2), + no_button + ); + } + + /** + * Returns 'true' (yes), 'false' (no) or 'nil' (cancel) + * + * @return boolean user input yes==true + */ + boolean WaitForYesNoCancelUserInput() { + any user_input = nil; + boolean ret = nil; + + while (true) { + user_input = UI::UserInput(); + // yes button + if (user_input == `yes) { + ret = true; + break; + // no button + } else if (user_input == `no) { + ret = false; + break; + // closing window uisng [x] + } else if (user_input == `cancel) { + ret = nil; + break; + } else { + y2error("Unknown user input: '%1'", user_input); + continue; + } + } + + return ret; + } + + /** + * Waits for user input and checks it agains accepted symbols. + * Returns the default symbol in case of `cancel (user closes the dialog). + * + * @param list <symbol> of accepted symbol by UserInput + * @param symbol default return for case of `cancel + */ + symbol WaitForSymbolUserInput (list <symbol> list_of_accepted, symbol default_symb) { + symbol user_input = nil; + symbol ret = nil; + + while (true) { + user_input = (symbol) UI::UserInput(); + if (contains(list_of_accepted, user_input)) { + ret = user_input; + break; + } else if (user_input == `cancel) { + ret = default_symb; + break; + } else { + y2error("Unknown user input: '%1'", user_input); + continue; + } + } + + return ret; + } + + /** + * Used for unsiged file or package. Opens dialog asking whether user wants + * to use this unsigned item. + * + * @param symbol item_type `file or `package + * @param string item_name file name or package name + * @return boolean use or don't use ('true' if 'yes') + */ + global boolean UseUnsignedItem (symbol item_type, string item_name) { + string description_text = sformat((item_type == `package ? + // popup question, %1 stands for the package name + _("The package '%1' is not digitally signed. This means that the origin +of the integrity of the package can not be verified. Installing the package +may put the integrity of your system at risk. + +Do you want to install it anyway?") + : + // popup question, %1 stands for the filename + _("The file '%1' is not digitally signed. This means that the origin +of the integrity of the file can not be verified. Using the file +may put the integrity of your system at risk. + +Do you want to use it anyway?") + ), item_name); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + `HBox ( + `VCenter(warning_icon), + // popup heading + `VCenter(`Heading( _("Signature Check Failed"))), + `HStretch() + ), + `Label(description_text), + YesNoButtons(`no) + ) + ); + + boolean ret = WaitForYesNoCancelUserInput(); + // default value + if (ret == nil) ret = false; + + UI::CloseDialog(); + return ret; + } + + /** + * Used for corrupted file or package. Opens dialog asking whether user wants + * to use this corrupted item. + * + * @param symbol item_type `file or `package + * @param string item_name file name or package name + * @return boolean use or don't use ('true' if 'yes') + */ + global boolean UseCorruptedItem (symbol item_type, string item_name) { + string description_text = sformat((item_type == `package ? + // popup question, %1 stands for the package name + _("The integrity check for package '%1' failed. This means that +the package has been changed by accident or by an attacker +since the repository creator has signed it. Installing it +is a big risk for the integrity and security of your system. + +Do you want to install it anyway?") + : + // popup question, %1 stands for the filename + _("The integrity check for file '%1' failed. This means that +the file has been changed by accident or by an attacker +since the repository creator has signed it. Installing it +is a big risk for the integrity and security of your system. + +Do you want to use it anyway?") + ), item_name); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + // popup heading + `HBox ( + `VCenter(error_icon), + `VCenter(`Heading( _("Validation Check Failed"))), + `HStretch() + ), + `Label(description_text), + YesNoButtons(`no) + ) + ); + + boolean ret = WaitForYesNoCancelUserInput(); + // default value + if (ret == nil) ret = false; + + UI::CloseDialog(); + return ret; + } + + /** + * Used for file or package signed by unknown key. + * + * @param symbol item_type `file or `package + * @param string item_name file name or package name + * @param string key_id + * @return symbol `yes, `no or `retry + */ + global symbol ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id) { + string description_text = sformat((item_type == `package ? + // popup question, %1 stands for the package name, %2 for the key ID + _("The package '%1' is digitally signed with an unknown GnuPG key '%2' +and we cannot find that key. This means that a trust relationship to the creator of the package +can not be established. Installing the package may put the integrity of your system at risk. + +Do you want to install it anyway?") + : + // popup question, %1 stands for the filename, %2 for the key ID + _("The file '%1' is digitally signed with an unknown GnuPG key '%2' +and we cannot find that key. This means that a trust relationship to the creator of the file +can not be established. Using the file may put the integrity of your system at risk. + +Do you want to use it anyway?") + ), item_name, key_id); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + `HBox ( + `VCenter(warning_icon), + // popup heading + `VCenter(`Heading( _("Uknown GnuPG Key"))), + `HStretch() + ), + `Label(description_text), + YesNoButtons(`no) + ) + ); + + // This will optionally offer to retrieve the key from gpg keyservers + // That's why it returns 'symbol' instead of 'boolean' + // But by now it only handles yes/no/cancel + symbol ret = (WaitForYesNoCancelUserInput() == true ? `yes : `no); + // default value + if (ret == nil) ret = `no; + + UI::CloseDialog(); + return ret; + } + + /** + * Used for file or package signed by a public key. This key is still + * not listed in trusted keys. + * + * @param symbol item_type `file or `package + * @param string item_name file name or package name + * @param string key_id + * @param string key_name + * @return symbol `key_import, `install, `skip + */ + global symbol ItemSignedWithPublicSignature (symbol item_type, string item_name, string key_id, string key_name) { + string description_text = sformat((item_type == `package ? + // popup question, %1 stands for the package name + _("The package '%1' is digitally signed +with key '%2 (%3)'. +There is no trust relationship to the owner of the key. You may chose to import +the key into your set of trusted keys in the Import dialog and then proceed +with the installation. You can also chose just to install the package anyway, +but be aware that packages from untrusted sources can put the integrity +of your system at risk.") + : + // popup question, %1 stands for the filename + _("The file '%1' is digitally signed +with key '%2 (%3)'. +There is no trust relationship to the owner of the key. You may chose to import +the key into your set of trusted keys in the Import dialog and then proceed +with the installation. You can also chose just to use the file anyway, +but be aware that packages from untrusted sources can put the integrity +of your system at risk.") + ), item_name, key_id, key_name); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + `HBox ( + `VCenter(warning_icon), + // popup heading + `VCenter(`Heading( _("Signed with Untrusted Public Key"))), + `HStretch() + ), + `Label(description_text), + `HBox ( + // push button + `PushButton(`id(`key_import), _("Key &Import Dialog")), + // push button + `PushButton(`id(`install), _("Install &Anyway")), + // push button + `PushButton(`id(`skip), _("&Skip Package")) + ) + ) + ); + UI::SetFocus(`skip); + + // wait for one of listed ID's, return the default value in case of `cancel + symbol ret = WaitForSymbolUserInput([`key_import, `install, `skip], `skip); + + UI::CloseDialog(); + return ret; + } + + /** + * ImportGPGKeyDialog + * + * @param string key_id + * @param string key_name + * @param string key_location + * @param string key_detailed_description + * @return symbol + */ + global symbol ImportGPGKeyDialog (string key_id, string key_name, string key_location, string key_detailed_description) { + // FIXME: add somewhere this additional text + // additional warning text (kind of help) + string warning_text = sformat(_("The owner of the key may distribute updates, packages and package repositories +that will be considered trusted by your system and which will be offered for installation +and update without any further warning. Importing the key thus allows the key owner +to have a certain amount of control over the software on your system and you should +only do this if you trust her/him. YaST comes up with a warning dialog for every +package that's not signed by a trusted (imported) key; this will happen to packages +by the package creator with key '%1' if you chose not to import."), key_id); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + `HBox ( + `VCenter(question_icon), + // popup heading + `VCenter(`Heading(_("Import Public GnuPG Key"))), + `HStretch() + ), + `Label(sformat( + // popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...) + _("The GnuPG key '%1 (%2)' has been found +on location '%3'. + +You can chose to import it into your keyring of trusted public keys - that means +you trust the owner of the key. You should be sure that you can trust the owner +and that the key really belongs to that owner before considering to import it."), + key_id, key_name, key_location + )), + `HBox ( + // push button + `PushButton(`id(`import), _("&Import")), + // push button + `PushButton(`id(`details), _("&Details")), + // push button + `PushButton(`id(`dont_import), _("Do &Not Import")) + ) + ) + ); + UI::SetFocus(`details); + + symbol ret = nil; + while (ret == nil || ret == `details) { + // wait for one of listed ID's, return the default value in case of `cancel + ret = WaitForSymbolUserInput([`import, `details, `dont_import], `dont_import); + if (contains([`import, `dont_import], ret)) break; + else if (ret == `details) Popup::LongMessage(key_detailed_description); + } + + UI::CloseDialog(); + return ret; + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.53/src/modules/SourceManager.ycp new/yast2-packager-2.13.54/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.53/src/modules/SourceManager.ycp 2006-03-02 09:44:42.000000000 +0100 +++ new/yast2-packager-2.13.54/src/modules/SourceManager.ycp 2006-03-28 15:51:57.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Anas Nashif <nashif(a)suse.de> * Status: Work in Progress * - * $Id: SourceManager.ycp 28410 2006-02-27 15:47:13Z jsrain $ + * $Id: SourceManager.ycp 29470 2006-03-28 12:11:22Z visnov $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -576,7 +576,8 @@ string color = source[ "enabled" ]:true ? "#006600" : "#FF0000"; sitem = sitem + HTML::Colorize("["+status+"] ", color); - sitem = sitem + productData[ "label" ]:"unknown"; + // translators: name of a source if no other idenfication found + sitem = sitem + productData[ "label" ]:generalData["type"]:_("unknown"); sitem = sitem + " ( " + generalData[ "url" ]:"" + ")"; return sitem; } @@ -598,7 +599,7 @@ ? _("On") // corresponds to the "Enable/Disable" button : _("Off"), - productData[ "label" ]:"unknown", + productData[ "label" ]:generalData["type"]:_("Unknown"), generalData[ "url" ]:"" ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0