commit yast2-packager

14 Dec 2006

Hello community,

here is the log from the commit of package yast2-packager
checked in at Thu Dec 14 02:07:43 CET 2006.

--------

--- yast2-packager/yast2-packager.changes	2006-12-06 15:30:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes	2006-12-13 14:46:28.000000000 +0100
@@ -1,0 +2,19 @@
+Wed Dec 13 14:19:27 CET 2006 - lslezak@suse.cz
+
+- display the correct error description in the error popup when
+  a download fails (#228178)
+- 2.15.2
+
+-------------------------------------------------------------------
+Tue Dec 12 12:40:49 CET 2006 - locilka@suse.cz
+
+- Desktop selection dialog doesn't use [Select] button anymore.
+  Other options are solved by another hidden radio-buttons
+  (#202132).
+
+-------------------------------------------------------------------
+Thu Dec  7 15:32:49 CET 2006 - lslezak@suse.cz
+
+- inst_source: `restart_menu is not needed anymore (#148683)
+
+-------------------------------------------------------------------

Old:
----
  yast2-packager-2.15.1.tar.bz2

New:
----
  yast2-packager-2.15.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.wXjVa3/_old	2006-12-14 02:07:16.000000000 +0100
+++ /var/tmp/diff_new_pack.wXjVa3/_new	2006-12-14 02:07:16.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-packager (Version 2.15.1)
+# spec file for package yast2-packager (Version 2.15.2)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,19 +11,19 @@
 # norootforbuild
 
 Name:           yast2-packager
-Version:        2.15.1
+Version:        2.15.2
 Release:        1
 License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-packager-2.15.1.tar.bz2
+Source0:        yast2-packager-2.15.2.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-slp yast2-testsuite yast2-xml
 Requires:       checkmedia yast2-country
 # Pkg::TargetStoreRemove(), bug #210552; Pkg::SourceCreateType(), bug #168358
 Requires:       yast2-pkg-bindings >= 2.14.0
-# Linuxrc::display_ip
-Requires:       yast2 >= 2.13.67
+# separate processes in ncurses control center
+Requires:       yast2 >= 2.15.0
 Requires:       yast2-storage
 Provides:       yast2-config-package-manager
 Obsoletes:      yast2-config-package-manager
@@ -46,7 +46,7 @@
     Arvin Schnell <arvin@suse.de>
 
 %prep
-%setup -n yast2-packager-2.15.1
+%setup -n yast2-packager-2.15.2
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,16 @@
 %doc %{prefix}/share/doc/packages/yast2-packager
 
 %changelog -n yast2-packager
+* Wed Dec 13 2006 - lslezak@suse.cz
+- display the correct error description in the error popup when
+  a download fails (#228178)
+- 2.15.2
+* Tue Dec 12 2006 - locilka@suse.cz
+- Desktop selection dialog doesn't use [Select] button anymore.
+  Other options are solved by another hidden radio-buttons
+  (#202132).
+* Thu Dec 07 2006 - lslezak@suse.cz
+- inst_source: `restart_menu is not needed anymore (#148683)
 * Wed Dec 06 2006 - lslezak@suse.cz
 - inst_source: removed extra UI::CloseDialog() call (#224944),
   check number of arguments

++++++ yast2-packager-2.15.1.tar.bz2 -> yast2-packager-2.15.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/Makefile.am new/yast2-packager-2.15.2/Makefile.am
--- old/yast2-packager-2.15.1/Makefile.am	2006-12-06 15:23:42.000000000 +0100
+++ new/yast2-packager-2.15.2/Makefile.am	2006-12-13 14:43:07.000000000 +0100
@@ -7,8 +7,7 @@
 #
 
 #where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
 
 VERSION			= $(shell cat $(srcdir)/VERSION)
 RPMNAME 		= $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
 # do we do Makefile.am for devtools? It is a little special...
 IS_DEVTOOLS		= $(findstring yast2-devtools,$(RPMNAME))
 
-DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
 ALL_PACKAGES		= $(DEVTOOLS_DIR)/admin/all-packages
 LEGALESE_DIR		= $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
 
@@ -34,7 +33,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 
 Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/Makefile.in new/yast2-packager-2.15.2/Makefile.in
--- old/yast2-packager-2.15.1/Makefile.in	2006-12-06 15:23:49.000000000 +0100
+++ new/yast2-packager-2.15.2/Makefile.in	2006-12-13 14:43:15.000000000 +0100
@@ -135,6 +135,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = $(shell cat $(srcdir)/VERSION)
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
@@ -201,15 +202,14 @@
 ystartupdir = @ystartupdir@
 
 #where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
 SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS      && echo SUBDIRS)
 ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
 HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
 
 # do we do Makefile.am for devtools? It is a little special...
 IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
 ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
 LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
 COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
@@ -220,7 +220,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 CLEANFILES = 
 MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/VERSION new/yast2-packager-2.15.2/VERSION
--- old/yast2-packager-2.15.1/VERSION	2006-12-06 15:23:33.000000000 +0100
+++ new/yast2-packager-2.15.2/VERSION	2006-12-13 14:40:51.000000000 +0100
@@ -1 +1 @@
-2.15.1
+2.15.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/configure new/yast2-packager-2.15.2/configure
--- old/yast2-packager-2.15.1/configure	2006-12-06 15:23:46.000000000 +0100
+++ new/yast2-packager-2.15.2/configure	2006-12-13 14:43:12.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.1.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.2.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -559,8 +559,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-packager'
 PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.1'
-PACKAGE_STRING='yast2-packager 2.15.1'
+PACKAGE_VERSION='2.15.2'
+PACKAGE_STRING='yast2-packager 2.15.2'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 ac_unique_file="RPMNAME"
@@ -659,6 +659,7 @@
 LN_S
 PKG_CONFIG_PATH
 XGETTEXT
+Y2DEVTOOLS_PREFIX
 CREATE_PKGCONFIG_TRUE
 CREATE_PKGCONFIG_FALSE
 CREATE_PKGCONFIG_NOARCH_TRUE
@@ -1180,7 +1181,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-packager 2.15.1 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1251,7 +1252,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-packager 2.15.1:";;
+     short | recursive ) echo "Configuration of yast2-packager 2.15.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1329,7 +1330,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-packager configure 2.15.1
+yast2-packager configure 2.15.2
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1343,7 +1344,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-packager $as_me 2.15.1, which was
+It was created by yast2-packager $as_me 2.15.2, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -2144,7 +2145,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-packager'
- VERSION='2.15.1'
+ VERSION='2.15.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2371,7 +2372,7 @@
 
 
 
-VERSION="2.15.1"
+VERSION="2.15.2"
 RPMNAME="yast2-packager"
 MAINTAINER="Ladislav Slezak <lslezak@suse.cz>"
 
@@ -2618,6 +2619,8 @@
    { (exit 1); exit 1; }; }
 fi
 
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
@@ -2796,6 +2799,34 @@
 echo "$as_me: error: ycpc is not installed" >&2;}
    { (exit 1); exit 1; }; }
 fi
+as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5
+echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+  :
+else
+
+    { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5
+echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;}
+
+fi
+
 
 
 ( cd src/config; ln -sf dirinstall.xml dirinstall.glade )
@@ -3229,7 +3260,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by yast2-packager $as_me 2.15.1, which was
+This file was extended by yast2-packager $as_me 2.15.2, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3272,7 +3303,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-packager config.status 2.15.1
+yast2-packager config.status 2.15.2
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -3534,9 +3565,9 @@
 LN_S!$LN_S$ac_delim
 PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim
 XGETTEXT!$XGETTEXT$ac_delim
+Y2DEVTOOLS_PREFIX!$Y2DEVTOOLS_PREFIX$ac_delim
 CREATE_PKGCONFIG_TRUE!$CREATE_PKGCONFIG_TRUE$ac_delim
 CREATE_PKGCONFIG_FALSE!$CREATE_PKGCONFIG_FALSE$ac_delim
-CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -3578,6 +3609,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim
 CREATE_PKGCONFIG_NOARCH_FALSE!$CREATE_PKGCONFIG_NOARCH_FALSE$ac_delim
 STYLESHEET_HTML!$STYLESHEET_HTML$ac_delim
 STYLESHEET_PDF!$STYLESHEET_PDF$ac_delim
@@ -3591,7 +3623,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/configure.in new/yast2-packager-2.15.2/configure.in
--- old/yast2-packager-2.15.1/configure.in	2006-12-06 15:23:42.000000000 +0100
+++ new/yast2-packager-2.15.2/configure.in	2006-12-13 14:43:07.000000000 +0100
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-packager
 dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-packager, 2.15.1, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.2, http://bugs.opensuse.org/, 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.15.1"
+VERSION="2.15.2"
 RPMNAME="yast2-packager"
 MAINTAINER="Ladislav Slezak <lslezak@suse.cz>"
 
@@ -110,6 +110,8 @@
     AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
 fi
 
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
@@ -142,6 +144,9 @@
 if test "$YCPC" = "false"; then
     AC_MSG_ERROR([ycpc is not installed])
 fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+    AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
 
 
 ( cd src/config; ln -sf dirinstall.xml dirinstall.glade )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/Makefile.in new/yast2-packager-2.15.2/src/Makefile.in
--- old/yast2-packager-2.15.1/src/Makefile.in	2006-12-06 15:23:47.000000000 +0100
+++ new/yast2-packager-2.15.2/src/Makefile.in	2006-12-13 14:43:13.000000000 +0100
@@ -104,6 +104,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/clients/Makefile.in new/yast2-packager-2.15.2/src/clients/Makefile.in
--- old/yast2-packager-2.15.1/src/clients/Makefile.in	2006-12-06 15:23:47.000000000 +0100
+++ new/yast2-packager-2.15.2/src/clients/Makefile.in	2006-12-13 14:43:13.000000000 +0100
@@ -110,6 +110,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/clients/inst_desktop.ycp new/yast2-packager-2.15.2/src/clients/inst_desktop.ycp
--- old/yast2-packager-2.15.1/src/clients/inst_desktop.ycp	2006-10-13 11:12:08.000000000 +0200
+++ new/yast2-packager-2.15.2/src/clients/inst_desktop.ycp	2006-12-13 14:37:36.000000000 +0100
@@ -4,7 +4,7 @@
  * Summary:	Desktop Selection
  * Authors:	Jiri Srain <jsrain@suse.cz>
  *
- * $Id: inst_desktop.ycp 33383 2006-10-13 09:12:02Z lslezak $
+ * $Id: inst_desktop.ycp 34914 2006-12-12 11:45:39Z locilka $
  *
  */
 
@@ -38,7 +38,6 @@
 {
     if (alt_desktop != "kde" && alt_desktop != "gnome")
     {
-	other_desktop = alt_desktop;
 	alt_desktop = "other";
     }
 }
@@ -78,7 +77,7 @@
 system.</p>")
 +
 // help text 3/3
-_("<p>Choose <b>Other</b> then press <b>Select</b> to select
+_("<p>Choose <b>Other</b> then select from
 an alternative, such as a text-only system or a minimal graphical
 system with a basic window manager.</p>");
 
@@ -106,7 +105,7 @@
 		`HSpacing (3),
 		`Top (`Label (gnome_blurb)),
 		`HSpacing (1),
-		`Right (`Top (`Image (
+		`Right (`Top ( `Image (
 		    Directory::themedir + "/current/icons/48x48/apps/gnome.png",
 			"")))
 	    )
@@ -114,15 +113,14 @@
 
 term contents = `RadioButtonGroup (`id (`desktop), `HBox (
     `HWeight(1, `Empty()),	// Distribute excess space 1:2 (left:right)
-    `VBox(
+    `VBox (
 	`VStretch (),
 	// label (in bold font)
-//	`Left (`Label (`opt (`boldFont), _("Graphical Desktop Environment"))),
-//	`VSpacing (1.4),
 	`VWeight (10, gnome),
 	`VSpacing (0.4),
 	`VWeight (10, kde),
 	`VSpacing (0.4),
+
 	`VWeight (10, `HBox (
 	    `Left (`RadioButton (`id ("other"), `opt(`notify, `boldFont),
 		// radio button
@@ -130,42 +128,37 @@
 		alt_desktop != "gnome" && alt_desktop != "kde"
 		    && alt_desktop != nil)),
 	    `HBox (
-		`HSpacing (3),
+		`HSpacing (2),
 		// push button
-		`PushButton (`id (`select), _("&Select..."))
+		`RadioButtonGroup (`id(`other_rb), `ReplacePoint (`id(`other_options), `VBox(`VSpacing(4))))
 	    )
 	)),
 	`VStretch ()
-//	`VWeight (5, `Empty())
     ),
     `HWeight (2, `Empty ())
 ));
 
-term expert_dialog = `VBox (
-    // frame
-    `MarginBox(2, 0.7, `Frame (_("Alternate Desktops"),
-	`MarginBox (1, 0.5, `RadioButtonGroup (`id (`desktop), `VBox (
-	    `Left (`RadioButton (`id ("min_x11"),
-		// radio button
-		_("Minimal &Graphical System"))),
-	    `Left (`RadioButton (`id ("text"),
-		// radio button
-		_("&Text Mode")))
-	))
-    ))),
-   `Right (`HBox (
-	`PushButton ( `id (`ok), `opt (`default), Label::OKButton ()),
-	`PushButton ( `id (`cancel), Label::CancelButton ())
-    ))
-);
+void EnableOtherOptions () {
+    UI::ReplaceWidget (`id (`other_options), `VBox (
+	`VSpacing (2),
+	`Left (`RadioButton (`id ("min_x11"), `opt(`notify),
+	    // radio button
+	    _("&Minimal Graphical System"), (other_desktop == "min_x11"))),
+	`Left (`RadioButton (`id ("text"), `opt(`notify),
+	    // radio button
+	    _("&Text Mode"), (other_desktop == "text")))
+    ));
+}
+
+void DisableOtherOptions () {
+    UI::ReplaceWidget (`id(`other_options), `VBox(`VSpacing(4)));
+}
 
 // dialog caption
 Wizard::SetContents (_("Desktop Selection"), contents, help,
     GetInstArgs::enable_back(), GetInstArgs::enable_next());
 Wizard::SetTitleIcon ("yast-desktop-select");
 Wizard::SetFocusToNextButton();
-UI::ChangeWidget(`select, `Enabled, alt_desktop != "gnome"
-    && alt_desktop != "kde" && alt_desktop != nil);
 
 any ret = nil;
 
@@ -173,55 +166,37 @@
     map event = UI::WaitForEvent();
     ret = event["ID"]:nil;
 
-    if (event["WidgetClass"]:nil == `RadioButton)
-    {
+    // by default, nothing is selected, enabling next
+    // handling [Next] button
+    if (ret == "gnome" || ret == "kde" || ret == "min_x11" || ret == "text") {
+	Wizard::EnableNextButton();
+    } else if (ret == "other" && (other_desktop == "min_x11" || other_desktop == "text")) {
 	Wizard::EnableNextButton();
-	UI::ChangeWidget (`select, `Enabled,
-	    UI::QueryWidget (`id ("other"), `Value));
+    } else {
+	Wizard::DisableNextButton();
     }
-    else if (ret == `next)
-    {
-	alt_desktop = (string)UI::QueryWidget (`id (`desktop), `CurrentButton);
-	if (alt_desktop == "other")
-	{
-	    if (other_desktop == nil)
-		ret = `select_next;
-	    else
-		alt_desktop = other_desktop;
-	}
-	if (alt_desktop == nil)
-	{
-	    // popup message
+
+    if (ret == `next) {
+	if (alt_desktop == nil || alt_desktop == "") {
 	    Popup::Message (_("No desktop was selected. Select the
 desktop to install."));
 	    ret = nil;
+	// alt_desktop is also neither 'nil' nor ""
+	} else if (alt_desktop == "other") {
+	    alt_desktop = other_desktop;
 	}
-    }
-    if (ret == `select || ret == `select_next)
-    {
-	UI::OpenDialog (expert_dialog);
-	string selected = other_desktop;
-	if (selected != "text")
-	    selected = "min_x11";
-	UI::ChangeWidget (`id (`desktop), `CurrentButton, selected);
-	any popup_ret = UI::UserInput ();
-	selected = (string)UI::QueryWidget (`id (`desktop), `CurrentButton);
-	UI::CloseDialog ();
-	if (popup_ret == `ok)
-	{
-	    other_desktop = selected;
-	    if (ret == `select_next)
-	    {
-		alt_desktop = other_desktop;
-		ret = `next;
-	    }
-	}
-    }
-    else if (ret == `abort)
-    {
+    } else if (ret == `abort) {
 	if (Popup::ConfirmAbort (Stage::initial () ? `painless : `incomplete))
 	    return `abort;
 	continue;
+    } else if (ret == "other") {
+	EnableOtherOptions();
+    } else if (ret == "gnome" || ret == "kde") {
+	alt_desktop = tostring (ret);
+	DisableOtherOptions();
+    } else if (ret == "min_x11" || ret == "text") {
+	alt_desktop = "other";
+	other_desktop = tostring (ret);
     }
 
 } until (ret == `back || ret == `next);
@@ -235,7 +210,7 @@
 {
     if (DefaultDesktop::Desktop () != alt_desktop)
     {
-	y2milestone ("Setting defualt desktop to %1", alt_desktop);
+	y2milestone ("Setting default desktop to %1", alt_desktop);
 	DefaultDesktop::SetDesktop (alt_desktop);
 	Packages::ForceFullRepropose ();
 	Packages::Reset ([`product]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/clients/inst_source.ycp new/yast2-packager-2.15.2/src/clients/inst_source.ycp
--- old/yast2-packager-2.15.1/src/clients/inst_source.ycp	2006-12-06 10:57:32.000000000 +0100
+++ new/yast2-packager-2.15.2/src/clients/inst_source.ycp	2006-12-13 14:10:20.000000000 +0100
@@ -649,8 +649,6 @@
 
 y2milestone ("Starting source sequence");
 symbol ret = Sequencer::Run (aliases, sequence);
-if (ret == `next && Mode::normal ())
-    ret	= `restart_menu;
 
 UI::CloseDialog ();
 return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/config/Makefile.in new/yast2-packager-2.15.2/src/config/Makefile.in
--- old/yast2-packager-2.15.1/src/config/Makefile.in	2006-12-06 15:23:47.000000000 +0100
+++ new/yast2-packager-2.15.2/src/config/Makefile.in	2006-12-13 14:43:13.000000000 +0100
@@ -104,6 +104,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/include/Makefile.in new/yast2-packager-2.15.2/src/include/Makefile.in
--- old/yast2-packager-2.15.1/src/include/Makefile.in	2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/src/include/Makefile.in	2006-12-13 14:43:14.000000000 +0100
@@ -114,6 +114,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/include/checkmedia/Makefile.in new/yast2-packager-2.15.2/src/include/checkmedia/Makefile.in
--- old/yast2-packager-2.15.1/src/include/checkmedia/Makefile.in	2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/src/include/checkmedia/Makefile.in	2006-12-13 14:43:14.000000000 +0100
@@ -105,6 +105,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/include/dirinstall/Makefile.in new/yast2-packager-2.15.2/src/include/dirinstall/Makefile.in
--- old/yast2-packager-2.15.1/src/include/dirinstall/Makefile.in	2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/src/include/dirinstall/Makefile.in	2006-12-13 14:43:14.000000000 +0100
@@ -105,6 +105,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/modules/Makefile.in new/yast2-packager-2.15.2/src/modules/Makefile.in
--- old/yast2-packager-2.15.1/src/modules/Makefile.in	2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/src/modules/Makefile.in	2006-12-13 14:43:14.000000000 +0100
@@ -108,6 +108,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.2/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.1/src/modules/PackageCallbacks.ycp	2006-12-06 09:29:49.000000000 +0100
+++ new/yast2-packager-2.15.2/src/modules/PackageCallbacks.ycp	2006-12-13 14:18:12.000000000 +0100
@@ -192,8 +192,23 @@
 
 	if (error != 0)
 	{
+	    // this is for error code 1 ("NOT_FOUND"), %1 is name of a package
 	    string message = sformat (_("Package %1 was not found on the medium."), name);
 
+	    // "IO"
+	    if (error == 2)
+	    {
+		// error message, %1 is a package name
+		message = sformat(_("Package %1 could not be downloaded (input/output error)."), name);
+	    }
+	    // "INVALID"
+	    else if (error == 3)
+	    {
+		// error message, %1 is a package name
+		message = sformat(_("Package %1 is broken, integrity check has failed."), name);
+	    }
+
+
 	    if (Mode::commandline()) {
 		CommandLine::Print(message);
 
@@ -251,9 +266,26 @@
 			showLongInfo = ShowLogInfo (message, button_box);
 			if (showLongInfo)
 			{
+			    string error_symbol = "ERROR";
+
+			    if (error == 1)
+			    {
+				error_symbol = "NOT_FOUND";
+			    }
+			    else if (error == 2)
+			    {
+				error_symbol = "IO";
+			    }
+			    else if (error == 3)
+			    {
+				error_symbol = "INVALID";
+			    }
+
 			    UI::ReplaceWidget(`id(`info),
 					      `RichText (`opt(`plainText),
-							 sformat (_("Error: %1:"), error) + reason) );
+							// error message, %1 is code of the error,
+							// detail string is appended to the end
+							 sformat (_("Error: %1:"), error_symbol) + reason) );
 			}
 			else
 			{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/modules/test.ycp new/yast2-packager-2.15.2/src/modules/test.ycp
--- old/yast2-packager-2.15.1/src/modules/test.ycp	2005-11-02 13:29:02.000000000 +0100
+++ new/yast2-packager-2.15.2/src/modules/test.ycp	1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-
-{
-    import "Package";
-    import "CommandLine";
-
-    textdomain "test";
-
-    boolean startHandler(map<string,string> opts) {
-	Package::InstallAll(["samba-doc", "qt3-devel-doc"]);
-//	Package::InstallAll(["sambadocdfdfdf"]);
-
-	return true;
-    }
-
-    symbol GUIhandler() {
-	y2milestone("GUIhandler");
-	return `next;
-    }
-
-    boolean Read() {
-	return true;
-    }
-
-    boolean Write() {
-	return true;
-    }
-
-    map cmdline = $[
-	// help text
-	"help"      : _("Start installation in a virtual machine"),
-	"id"        : "vm",
-	"guihandler": GUIhandler,
-	"initialize": Read,
-	"finish"    : Write,
-	"actions"   : $[
-	    "start" : $[
-		// command description
-		"help"      : _("Start installation"),
-		"handler"   : startHandler
-	    ]
-	],
-	"options" : $[
-	    "configured" : $[
-		// option description
-		"help"      : _("List only configured devices")
-	    ],
-	    "all" : $[
-		// option description
-		"help"	    : _("List all detected IDE devices")
-	    ]
-	],
-	"mappings" : $[
-	    "start" : ["configured", "all"],
-	]
-    ];
-
-    any ret = CommandLine::Run(cmdline);
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/test.pot new/yast2-packager-2.15.2/test.pot
--- old/yast2-packager-2.15.1/test.pot	2006-11-08 10:20:30.000000000 +0100
+++ new/yast2-packager-2.15.2/test.pot	2006-12-13 09:58:56.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-08 10:20+0100\n"
+"POT-Creation-Date: 2006-12-13 09:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/testsuite/Makefile.in new/yast2-packager-2.15.2/testsuite/Makefile.in
--- old/yast2-packager-2.15.1/testsuite/Makefile.in	2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/testsuite/Makefile.in	2006-12-13 14:43:14.000000000 +0100
@@ -101,6 +101,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)