commit yast2-installation

26 Oct 2006

Hello community,

here is the log from the commit of package yast2-installation
checked in at Thu Oct 26 20:31:43 CEST 2006.

--------

--- yast2-installation/yast2-installation.changes	2006-10-24 11:03:22.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes	2006-10-26 17:20:33.000000000 +0200
@@ -1,0 +2,20 @@
+Thu Oct 26 14:51:12 CEST 2006 - locilka@suse.cz
+
+- Enabling back button in the License Agreement dialog (#215236).
+- Adding add-on.rnc for AutoYaST profile validation (#215248).
+- Providing an easier switch to disable IPv6 by a new ipv6 client
+  in the network proposal (FATE #300604) (mzugec).
+- 2.14.5
+
+-------------------------------------------------------------------
+Wed Oct 25 16:28:14 CEST 2006 - locilka@suse.cz
+
+- Adding more debugging messages in order to fix random crashing
+  of the second stage installation (#214886).
+
+-------------------------------------------------------------------
+Tue Oct 24 13:57:57 CEST 2006 - locilka@suse.cz
+
+- Renamed control file control.PROF.xml to control.openSUSE.xml
+
+-------------------------------------------------------------------

Old:
----
  yast2-installation-2.14.4.tar.bz2

New:
----
  yast2-installation-2.14.5.tar.bz2

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

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.ohccOv/_old	2006-10-26 20:30:52.000000000 +0200
+++ /var/tmp/diff_new_pack.ohccOv/_new	2006-10-26 20:30:52.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-installation (Version 2.14.4)
+# spec file for package yast2-installation (Version 2.14.5)
 #
 # 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.14.4
-Release:        3
+Version:        2.14.5
+Release:        1
 License:        GNU General Public License (GPL) - all versions
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-installation-2.14.4.tar.bz2
+Source0:        yast2-installation-2.14.5.tar.bz2
 prefix:		/usr
 BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite
 Requires:       yast2-slp yast2-firewall
@@ -68,7 +68,7 @@
     Jiri Srain <jsrain@suse.cz>
 
 %prep
-%setup -n yast2-installation-2.14.4
+%setup -n yast2-installation-2.14.5
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,7 @@
 /usr/share/YaST2/modules/*.ycp
 /usr/share/YaST2/modules/*.ybc
 %{prefix}/share/applications/YaST2/*.desktop
+/usr/share/YaST2/schema/autoyast/rnc/add-on.rnc
 %dir /usr/share/YaST2/include/installation
 /usr/share/YaST2/include/installation/*
 # agents
@@ -131,6 +132,17 @@
 %endif
 
 %changelog -n yast2-installation
+* Thu Oct 26 2006 - locilka@suse.cz
+- Enabling back button in the License Agreement dialog (#215236).
+- Adding add-on.rnc for AutoYaST profile validation (#215248).
+- Providing an easier switch to disable IPv6 by a new ipv6 client
+  in the network proposal (FATE #300604) (mzugec).
+- 2.14.5
+* Wed Oct 25 2006 - locilka@suse.cz
+- Adding more debugging messages in order to fix random crashing
+  of the second stage installation (#214886).
+* Tue Oct 24 2006 - locilka@suse.cz
+- Renamed control file control.PROF.xml to control.openSUSE.xml
 * Tue Oct 24 2006 - ms@suse.de
 - fixed nic detection (#213870)
 * Mon Oct 23 2006 - locilka@suse.cz

++++++ yast2-installation-2.14.4.tar.bz2 -> yast2-installation-2.14.5.tar.bz2 ++++++
++++    2443 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-installation-2.14.4/Makefile.am.common new/yast2-installation-2.14.5/Makefile.am.common
--- old/yast2-installation-2.14.4/Makefile.am.common	2006-10-24 10:59:36.000000000 +0200
+++ new/yast2-installation-2.14.5/Makefile.am.common	2006-10-26 17:24:58.000000000 +0200
@@ -29,19 +29,7 @@
 
 dist-hook: check-syntax
 
-CHECK_SYNTAX = true
 check-syntax: $(client_DATA) $(ycpchook)
-	@if test "$(client_DATA)"; then \
-	  if $(CHECK_SYNTAX); then \
-	    TO_CHECK="$(filter %.ycp,$^)"; \
-	    echo "Checking syntax of $${TO_CHECK}"; \
-	    if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
-	      echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
-	      exit 1; \
-	    fi; \
-	  else \
-	    echo "Syntax check disabled"; \
-	  fi; \
-	fi
+	if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
 
 -include .dep
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-installation-2.14.4/VERSION new/yast2-installation-2.14.5/VERSION
--- old/yast2-installation-2.14.4/VERSION	2006-10-24 10:59:19.000000000 +0200
+++ new/yast2-installation-2.14.5/VERSION	2006-10-26 17:20:16.000000000 +0200
@@ -1 +1 @@
-2.14.4
+2.14.5
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-installation-2.14.4/configure.in new/yast2-installation-2.14.5/configure.in
--- old/yast2-installation-2.14.4/configure.in	2006-10-24 10:59:36.000000000 +0200
+++ new/yast2-installation-2.14.5/configure.in	2006-10-26 17:24:58.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-installation
 dnl
-dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-installation, 2.14.4, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.14.5, http://bugs.opensuse.org/, 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.14.4"
+VERSION="2.14.5"
 RPMNAME="yast2-installation"
 MAINTAINER="Lukas Ocilka <locilka@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-installation-2.14.4/control/Makefile.am new/yast2-installation-2.14.5/control/Makefile.am
--- old/yast2-installation-2.14.4/control/Makefile.am	2006-03-08 16:18:20.000000000 +0100
+++ new/yast2-installation-2.14.5/control/Makefile.am	2006-10-24 13:59:17.000000000 +0200
@@ -24,5 +24,5 @@
 
 validate:
 	trang -I rnc -O rng control.rnc control.rng
-	xmllint --relaxng control.rng control.PROF.xml --noout
+	xmllint --relaxng control.rng control.openSUSE.xml --noout
 
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-installation-2.14.4/control/README new/yast2-installation-2.14.5/control/README
--- old/yast2-installation-2.14.4/control/README	2006-10-24 10:59:19.000000000 +0200
+++ new/yast2-installation-2.14.5/control/README	2006-10-24 13:57:34.000000000 +0200
@@ -11,8 +11,7 @@
 
     - skelcd-control-SLD
     - skelcd-control-SLES
-    - skelcd-control-SUSELinux-Prof
-    - skelcd-control-SUSELinux-Pers
+    - skelcd-control-openSUSE
 
 Add-On Products:
 ----------------
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-installation-2.14.4/src/clients/desktop_finish.ycp new/yast2-installation-2.14.5/src/clients/desktop_finish.ycp
--- old/yast2-installation-2.14.4/src/clients/desktop_finish.ycp	2006-10-16 11:18:55.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/desktop_finish.ycp	2006-07-18 11:27:46.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *  Jiri Srain <jsrain@suse.cz>
  *
- * $Id: desktop_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: desktop_finish.ycp 31885 2006-07-17 08:14:59Z jsrain $
  *
  */
 
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-installation-2.14.4/src/clients/inst_congratulate.ycp new/yast2-installation-2.14.5/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.14.4/src/clients/inst_congratulate.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/inst_congratulate.ycp	2006-07-24 09:57:00.000000000 +0200
@@ -6,7 +6,7 @@
  *
  * Display a congratulation message for the user.
  *
- * $Id: inst_congratulate.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: inst_congratulate.ycp 31936 2006-07-18 14:16:43Z jsrain $
  */
 
 {
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-installation-2.14.4/src/clients/inst_finish.ycp new/yast2-installation-2.14.5/src/clients/inst_finish.ycp
--- old/yast2-installation-2.14.4/src/clients/inst_finish.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/inst_finish.ycp	2006-09-13 11:12:49.000000000 +0200
@@ -6,7 +6,7 @@
  *		Arvin Schnell <arvin@suse.de>
  *              Jiri Srain <jsrain@suse.de>
  *
- * $Id: inst_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: inst_finish.ycp 32850 2006-09-13 09:14:23Z locilka $
  *
  * Writes:
  * [target] /var/lib/YaST2/runme_at_boot	run yast2 after initial boot
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-installation-2.14.4/src/clients/inst_license.ycp new/yast2-installation-2.14.5/src/clients/inst_license.ycp
--- old/yast2-installation-2.14.4/src/clients/inst_license.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/inst_license.ycp	2006-10-09 13:28:35.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:	Generic License File
  * Authors:	Anas Nashif <nashif@suse.de>
  *
- * $Id: inst_license.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: inst_license.ycp 33271 2006-10-09 11:28:31Z locilka $
  *
  */
 
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-installation-2.14.4/src/clients/inst_proposal.ycp new/yast2-installation-2.14.5/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.14.4/src/clients/inst_proposal.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/inst_proposal.ycp	2006-10-09 13:28:35.000000000 +0200
@@ -7,7 +7,7 @@
  *		Jiri Srain <jsrain@suse.cz>
  *		Lukas Ocilka <locilka@suse.cz>
  *
- * $Id: inst_proposal.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: inst_proposal.ycp 33271 2006-10-09 11:28:31Z locilka $
  *
  * Create and display reasonable proposal for basic
  * installation and call sub-workflows as required
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-installation-2.14.4/src/clients/inst_release_notes.ycp new/yast2-installation-2.14.5/src/clients/inst_release_notes.ycp
--- old/yast2-installation-2.14.4/src/clients/inst_release_notes.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/inst_release_notes.ycp	2006-10-09 13:28:35.000000000 +0200
@@ -7,7 +7,7 @@
  *
  * Display release notes.
  *
- * $Id: inst_release_notes.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: inst_release_notes.ycp 33271 2006-10-09 11:28:31Z locilka $
  */
 
 {
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-installation-2.14.4/src/clients/inst_startup.ycp new/yast2-installation-2.14.5/src/clients/inst_startup.ycp
--- old/yast2-installation-2.14.4/src/clients/inst_startup.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/inst_startup.ycp	2006-10-09 13:28:35.000000000 +0200
@@ -13,7 +13,7 @@
  * - Probe all controllers for disks
  * - Probe all disks for partition data
  *
- * $Id: inst_startup.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: inst_startup.ycp 33271 2006-10-09 11:28:31Z locilka $
  */
 
 {
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-installation-2.14.4/src/clients/inst_system_analysis.ycp new/yast2-installation-2.14.5/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.14.4/src/clients/inst_system_analysis.ycp	2006-10-16 11:18:55.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/inst_system_analysis.ycp	2006-10-09 13:28:35.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:	Installation mode selection, system analysis
  * Authors:	Jiri Srain <jsrain@suse.cz>
  *
- * $Id: inst_system_analysis.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: inst_system_analysis.ycp 33271 2006-10-09 11:28:31Z locilka $
  *
  */
 
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-installation-2.14.4/src/clients/installation_worker.ycp new/yast2-installation-2.14.5/src/clients/installation_worker.ycp
--- old/yast2-installation-2.14.4/src/clients/installation_worker.ycp	2006-10-24 10:59:19.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/installation_worker.ycp	2006-10-25 16:27:08.000000000 +0200
@@ -395,6 +395,8 @@
     string restart_data_file = "/var/lib/YaST2/continue_installation";
     string reboot_file = "/var/lib/YaST2/reboot";
     string restart_file = "/var/lib/YaST2/restart_yast";
+
+    // Continue the second stage installation
     if (Stage::cont ()
 	&& (integer)SCR::Read (.target.size, restart_data_file) > 0)
     {
@@ -409,27 +411,37 @@
 	    ProductControl::first_step = 0;
 	    ProductControl::restarting_step = nil;
 	    ret = ProductControl::Run();
+	    y2milestone ("ProductControl::Run() returned %1", ret);
 	}
 	else
 	{
 	    ProductControl::first_step = next_step;
 	    ProductControl::restarting_step = restarting_step;
 	    ret = ProductControl::RunFrom (next_step, false);
+	    y2milestone ("ProductControl::RunFrom(%1) returned %2", next_step, ret);
+	}
+	
+	if (FileUtils::Exists (reboot_file)) {
+	    y2milestone ("Removing file %1", reboot_file);
+	    SCR::Execute (.target.remove, reboot_file);
+	}
+	if (FileUtils::Exists (restart_file)) {
+	    y2milestone ("Removing file %1", restart_file);
+	    SCR::Execute(.target.remove, restart_file);
+	}
+	if (FileUtils::Exists (restart_data_file)) {
+	    y2milestone ("Removing file %1", restart_data_file);
+	    SCR::Execute(.target.remove, restart_data_file);
 	}
-	SCR::Execute (.target.bash, sformat (
-	    "test -f %1 && /bin/rm -f %1", reboot_file));
-	SCR::Execute (.target.bash, sformat (
-	    "test -f %1 && /bin/rm -f %1", restart_file));
-	SCR::Execute (.target.bash, sformat (
-	    "test -f %1 && /bin/rm -f %1", restart_data_file));
     }
     else
     {
 	// Run the installation workflow
 	ret = ProductControl::Run();
+	y2milestone ("ProductControl::Run() returned %1", ret);
     }
 
-    y2milestone ("ProductControl::Run() returned %1", ret);
+    y2milestone("Evaluating ret: %1", ret);
 
     if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step))
     {
@@ -455,6 +467,7 @@
 	}
     }
 
+    // Installation has been aborted
     if (ret == `abort)
     {
 	// tell linuxrc that we aborted
@@ -524,6 +537,8 @@
 	SCR::Execute (.target.bash, sformat ("touch %1", file_inst_aborted));
     }
 
+    y2milestone("Finishing the installation...");
+
     // TRANSLATORS: busy message
     UI::OpenDialog (`Label(_("Finishing the installation..."))); // #2
     // 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-installation-2.14.4/src/clients/save_config_finish.ycp new/yast2-installation-2.14.5/src/clients/save_config_finish.ycp
--- old/yast2-installation-2.14.4/src/clients/save_config_finish.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/save_config_finish.ycp	2006-09-22 16:49:30.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *  Jiri Srain <jsrain@suse.cz>
  *
- * $Id: save_config_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: save_config_finish.ycp 33062 2006-09-22 14:51:08Z locilka $
  *
  */
 
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-installation-2.14.4/src/clients/save_hw_status_finish.ycp new/yast2-installation-2.14.5/src/clients/save_hw_status_finish.ycp
--- old/yast2-installation-2.14.4/src/clients/save_hw_status_finish.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/save_hw_status_finish.ycp	2006-09-25 11:01:56.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *  Jiri Srain <jsrain@suse.cz>
  *
- * $Id: save_hw_status_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: save_hw_status_finish.ycp 33076 2006-09-25 08:59:36Z jsrain $
  *
  */
 
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-installation-2.14.4/src/clients/switch_scr_finish.ycp new/yast2-installation-2.14.5/src/clients/switch_scr_finish.ycp
--- old/yast2-installation-2.14.4/src/clients/switch_scr_finish.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/switch_scr_finish.ycp	2006-10-02 17:07:07.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *  Jiri Srain <jsrain@suse.cz>
  *
- * $Id: switch_scr_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: switch_scr_finish.ycp 33233 2006-10-02 15:07:05Z locilka $
  *
  */
 
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-installation-2.14.4/src/clients/test_inst_client.ycp new/yast2-installation-2.14.5/src/clients/test_inst_client.ycp
--- old/yast2-installation-2.14.4/src/clients/test_inst_client.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/test_inst_client.ycp	2006-08-23 16:58:34.000000000 +0200
@@ -3,7 +3,7 @@
  * Summary:	For testing the network and hardware proposals.
  * Author:	Michal Svec <msvec@suse.cz>
  *
- * $Id: test_inst_client.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: test_inst_client.ycp 32528 2006-08-23 11:23:58Z jsrain $
  */
 
 {
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-installation-2.14.4/src/clients/test_proposal.ycp new/yast2-installation-2.14.5/src/clients/test_proposal.ycp
--- old/yast2-installation-2.14.4/src/clients/test_proposal.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/test_proposal.ycp	2006-08-23 08:30:51.000000000 +0200
@@ -3,7 +3,7 @@
  * Summary:	For testing the network and hardware proposals.
  * Author:	Michal Svec <msvec@suse.cz>
  *
- * $Id: test_proposal.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: test_proposal.ycp 32509 2006-08-22 17:28:33Z mvidner $
  */
 
 {
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-installation-2.14.4/src/clients/umount_finish.ycp new/yast2-installation-2.14.5/src/clients/umount_finish.ycp
--- old/yast2-installation-2.14.4/src/clients/umount_finish.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/umount_finish.ycp	2006-09-13 14:14:59.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *  Jiri Srain <jsrain@suse.cz>
  *
- * $Id: umount_finish.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: umount_finish.ycp 32853 2006-09-13 12:16:36Z locilka $
  *
  */
 
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-installation-2.14.4/src/clients/vendor.ycp new/yast2-installation-2.14.5/src/clients/vendor.ycp
--- old/yast2-installation-2.14.4/src/clients/vendor.ycp	2006-10-16 11:18:54.000000000 +0200
+++ new/yast2-installation-2.14.5/src/clients/vendor.ycp	2006-07-26 10:58:50.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:	Load vendor driver CD
  * Authors:	Klaus Kaempf <kkaempf@suse.de>
  *
- * $Id: vendor.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: vendor.ycp 31984 2006-07-26 07:21:09Z jsrain $
  */
 
 {
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-installation-2.14.4/src/config/Makefile.am new/yast2-installation-2.14.5/src/config/Makefile.am
--- old/yast2-installation-2.14.4/src/config/Makefile.am	2006-10-16 11:18:56.000000000 +0200
+++ new/yast2-installation-2.14.5/src/config/Makefile.am	2006-10-26 16:12:09.000000000 +0200
@@ -4,6 +4,9 @@
 
 fvwm_DATA = fvwmrc.yast2
 
-EXTRA_DIST = $(desktop_DATA) $(fvwm_DATA)
+rncdir =  $(schemadir)/autoyast/rnc
+rnc_DATA = add-on.rnc
+
+EXTRA_DIST = $(desktop_DATA) $(fvwm_DATA) $(rnc_DATA)
 
 include $(top_srcdir)/Makefile.am.common
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-installation-2.14.4/src/config/add-on.desktop new/yast2-installation-2.14.5/src/config/add-on.desktop
--- old/yast2-installation-2.14.4/src/config/add-on.desktop	2006-04-06 17:02:36.000000000 +0200
+++ new/yast2-installation-2.14.5/src/config/add-on.desktop	2006-10-26 16:09:58.000000000 +0200
@@ -16,6 +16,7 @@
 X-SuSE-YaST-SortKey=
 X-SuSE-YaST-AutoInstResource=
 X-SuSE-YaST-AutoInstPath=install
+X-SuSE-YaST-AutoInstSchema=add-on.rnc
 
 Icon=yast-addon
 Exec=/sbin/yast2 add-on
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-installation-2.14.4/src/config/add-on.rnc new/yast2-installation-2.14.5/src/config/add-on.rnc
--- old/yast2-installation-2.14.4/src/config/add-on.rnc	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.14.5/src/config/add-on.rnc	2006-10-26 16:43:01.000000000 +0200
@@ -0,0 +1,20 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace config = "http://www.suse.com/1.0/configns"
+
+add-on =
+  element add-on { add_on_products* }
+listentry =
+  element listentry {
+     media_url? &
+     product? &
+     product_dir?
+  }
+media_url = element media_url { text }
+product = element product { text }
+product_dir = element product_dir { text }
+add_on_products =
+  element add_on_products {
+     attribute config:type { text }?,
+     listentry*
+  }
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-installation-2.14.4/src/modules/Product.ycp new/yast2-installation-2.14.5/src/modules/Product.ycp
--- old/yast2-installation-2.14.4/src/modules/Product.ycp	2006-10-16 11:18:56.000000000 +0200
+++ new/yast2-installation-2.14.5/src/modules/Product.ycp	2006-08-10 10:05:19.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:	Product data
  * Authors:	Klaus Kaempf <kkaempf@suse.de>
  *
- * $Id: Product.ycp 33280 2006-10-09 14:21:31Z locilka $
+ * $Id: Product.ycp 32270 2006-08-09 12:59:35Z jsrain $
  */
 
 {
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-installation-2.14.4/src/modules/ProductLicense.ycp new/yast2-installation-2.14.5/src/modules/ProductLicense.ycp
--- old/yast2-installation-2.14.4/src/modules/ProductLicense.ycp	2006-10-24 10:59:19.000000000 +0200
+++ new/yast2-installation-2.14.5/src/modules/ProductLicense.ycp	2006-10-26 15:03:35.000000000 +0200
@@ -131,7 +131,7 @@
 ");
 
     Wizard::SetContents(caption, contents, help,
-	false, back);
+	back, true);
     // bugzilla #203543
     if (size(langs) <= 1) {
 	UI::ChangeWidget (`id(`lang), `Enabled, false);
@@ -197,9 +197,10 @@
  *   and not 1st stage installation
  * @param patterns a list of patterns for the files, regular expressions
  *   with %1 for the language
+ * @param enable_back sets the back_button status
  */
 global symbol AskLicenseAgreement (integer src_id, string dir,
-    list<string> patterns, string action)
+    list<string> patterns, string action, boolean enable_back)
 {
     string tmpdir = nil;
     string info_file = nil;
@@ -289,7 +290,7 @@
 	lic_lang = available_langs[0]:"";
 
     y2milestone ("Preselected language: '%1'", lic_lang);
-    DisplayLicenseDialog (available_langs, true);
+    DisplayLicenseDialog (available_langs, enable_back);
     // Display info as a popup if exists
     if (info_file != nil)
 	InstShowInfo::show_info_txt(info_file);
@@ -415,19 +416,23 @@
 global symbol AskAddOnLicenseAgreement (integer src_id) {
     return AskLicenseAgreement (src_id, "",
 	[ "license\\.txt", "license\\.%1\\.txt" ],
-	"abort");
+	"abort",
+	// back button is disabled
+	false);
 }
 
 global symbol AskFirstStageLicenseAgreement (string action) {
     return AskLicenseAgreement (nil, "",
 	[ "license\\.txt", "license\\.%1\\.txt" ],
-	action);
+	action,
+	// back button is enabled
+	true);
 }
 
 global symbol AskInstalledLicenseAgreement (string directory,
     list<string> patterns, string action)
 {
-    return AskLicenseAgreement (nil, directory, patterns, action);
+    return AskLicenseAgreement (nil, directory, patterns, action, false);
 
 }
 
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-installation-2.14.4/startup/YaST2.Second-Stage new/yast2-installation-2.14.5/startup/YaST2.Second-Stage
--- old/yast2-installation-2.14.4/startup/YaST2.Second-Stage	2006-10-16 11:18:56.000000000 +0200
+++ new/yast2-installation-2.14.5/startup/YaST2.Second-Stage	2006-08-09 12:31:07.000000000 +0200
@@ -15,7 +15,7 @@
 #               : We will now prepare YaST2 for the so called continue
 #               : mode
 #               :
-# STATUS        : $Id: YaST2.Second-Stage 33280 2006-10-09 14:21:31Z locilka $
+# STATUS        : $Id: YaST2.Second-Stage 32171 2006-08-04 14:35:07Z jsrain $
 #----------------
 #set -x
 


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



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)