Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Wed Feb 4 00:57:42 CET 2009.
--------
--- yast2-installation/yast2-installation.changes 2009-01-28 16:00:31.000000000 +0100
+++ yast2-installation/yast2-installation.changes 2009-02-02 16:56:51.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Feb 2 13:09:08 CET 2009 - locilka@suse.cz
+
+- Erasing all old additional control files in the final step of
+ upgrade before rebooting to the second stage (bnc #471454).
+- InstError can now save YaST logs on user request.
+- 2.18.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.18.3.tar.bz2
New:
----
yast2-installation-2.18.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.D11108/_old 2009-02-04 00:56:09.000000000 +0100
+++ /var/tmp/diff_new_pack.D11108/_new 2009-02-04 00:56:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.18.3)
+# spec file for package yast2-installation (Version 2.18.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.18.3
+Version: 2.18.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.18.3.tar.bz2
+Source0: yast2-installation-2.18.4.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# xmllint
@@ -124,7 +124,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.18.3
+%setup -n yast2-installation-2.18.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -195,6 +195,11 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Mon Feb 02 2009 locilka@suse.cz
+- Erasing all old additional control files in the final step of
+ upgrade before rebooting to the second stage (bnc #471454).
+- InstError can now save YaST logs on user request.
+- 2.18.4
* Wed Jan 28 2009 locilka@suse.cz
- Added new InstError module for unified reporting of errors
during installation.
++++++ yast2-installation-2.18.3.tar.bz2 -> yast2-installation-2.18.4.tar.bz2 ++++++
++++ 9626 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.18.3/configure.in new/yast2-installation-2.18.4/configure.in
--- old/yast2-installation-2.18.3/configure.in 2009-01-22 12:44:27.000000000 +0100
+++ new/yast2-installation-2.18.4/configure.in 2009-02-03 16:36:08.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.18.1, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.18.4, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.1"
+VERSION="2.18.4"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
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.18.3/src/include/inst_inc_first.ycp new/yast2-installation-2.18.4/src/include/inst_inc_first.ycp
--- old/yast2-installation-2.18.3/src/include/inst_inc_first.ycp 2009-01-22 13:52:03.000000000 +0100
+++ new/yast2-installation-2.18.4/src/include/inst_inc_first.ycp 2009-02-02 10:48:52.000000000 +0100
@@ -140,7 +140,6 @@
"disks_activate", // disks activated before running upgrade
"mode", // always doing update, is already preselected
"update_partition", // no mounting
- "do_resize", // why is this included in upgrade at all? it is empty anyway
"prepdisk", // disks already mounted, it is dummy in update anyway
], {
ProductControl::DisableModule (m);
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.18.3/src/inst_finish/copy_files_finish.ycp new/yast2-installation-2.18.4/src/inst_finish/copy_files_finish.ycp
--- old/yast2-installation-2.18.3/src/inst_finish/copy_files_finish.ycp 2009-01-22 12:47:16.000000000 +0100
+++ new/yast2-installation-2.18.4/src/inst_finish/copy_files_finish.ycp 2009-02-02 13:12:34.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: copy_files_finish.ycp 54888 2009-01-22 11:47:19Z locilka $
+ * $Id: copy_files_finish.ycp 55179 2009-02-02 12:12:35Z locilka $
*
*/
@@ -65,9 +65,12 @@
SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp",
workflows_list);
- SCR::Execute (.target.bash, "/bin/mkdir -p " +
- "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'");
+ // Remove the directory with all additional control files (if exists)
+ // and create it again (empty). BNC #471454
+ SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'",
+ String::Quote (Installation::destdir + Directory::etcdir + "/control_files")));
+ // Now copy all the additional control files to the just installed system
foreach (string file, WorkflowManager::GetAllUsedControlFiles(), {
SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " +
"'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'");
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.18.3/src/modules/InstError.ycp new/yast2-installation-2.18.4/src/modules/InstError.ycp
--- old/yast2-installation-2.18.3/src/modules/InstError.ycp 2009-01-28 15:01:45.000000000 +0100
+++ new/yast2-installation-2.18.4/src/modules/InstError.ycp 2009-02-02 16:55:11.000000000 +0100
@@ -16,9 +16,62 @@
import "Icon";
import "Label";
+ import "String";
+ import "Report";
+
+ boolean SaveLogs () {
+ map cmd = (map) WFM::Execute (.local.bash_output, "echo ${HOME}");
+ string homedir = "/";
+
+ if (cmd["exit"]:-1 == 0) {
+ homedir = splitstring (cmd["stdout"]:"/", "\n")[0]:"/";
+ if (homedir == "") homedir = "/";
+ } else {
+ y2warning ("Unable to find out home dir: %1, using %2", cmd, homedir);
+ }
+ homedir = sformat ("%1/y2logs.tgz", homedir);
+
+ string savelogsto = (string) UI::AskForSaveFileName (
+ homedir,
+ "*.tgz *.tar.gz *.tar.bz2",
+ _("Save y2logs to...")
+ );
+
+ if (savelogsto == nil)
+ return nil;
+
+ // Busy message, %1 is replaced with a filename
+ UI::OpenDialog (`Label (sformat (_("Saving YaST logs to %1..."), savelogsto)));
+ y2milestone ("Saving YaST logs to: %1", savelogsto);
+
+ cmd = (map) WFM::Execute (.local.bash_output, sformat ("save_y2logs '%1'", String::Quote (savelogsto)));
+ boolean dialog_ret = nil;
+
+ if (cmd["exit"]:-1 != 0) {
+ y2error ("Unable to save logs to %1", savelogsto);
+
+ Report::Error (sformat (
+ // Error message, %1 is replaced with a filename
+ // %2 with am error reason (there is a newline between %1 and %2)
+ _("Unable to save YaST logs to %1
+%2"),
+ savelogsto,
+ cmd["stderr"]:""
+ ));
+
+ dialog_ret = false;
+ } else {
+ y2milestone ("Logs have been saved to: %1", savelogsto);
+ dialog_ret = true;
+ }
+
+ UI::CloseDialog();
+
+ return dialog_ret;
+ }
global void ShowErrorPopUp (string heading, string error_text, string details) {
- boolean success = UI::OpenDialog (`VBox (
+ boolean success = (boolean) UI::OpenDialog (`VBox (
`Left (`HBox (
`HSquash (`MarginBox (0.5, 0.2, Icon::Error())),
`Heading (heading)
@@ -55,7 +108,11 @@
)))
)
),
- `ButtonBox (`PushButton (`id(`ok), Label::OKButton()))
+ `ButtonBox (
+ // FIXME: BNC #422612, Use `opt(`noSanityCheck) later
+ `PushButton (`id(`save_y2logs), `opt(`cancelButton), _("&Save YaST Logs...")),
+ `PushButton (`id(`ok), Label::OKButton())
+ )
));
if (success != true) {
@@ -63,7 +120,17 @@
return;
}
- UI::UserInput();
+ any uret = nil;
+
+ while (true) {
+ uret = UI::UserInput();
+
+ if (uret == `save_y2logs) {
+ SaveLogs();
+ } else {
+ break;
+ }
+ }
UI::CloseDialog();
}
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.18.3/VERSION new/yast2-installation-2.18.4/VERSION
--- old/yast2-installation-2.18.3/VERSION 2009-01-27 17:39:04.000000000 +0100
+++ new/yast2-installation-2.18.4/VERSION 2009-02-02 13:12:58.000000000 +0100
@@ -1 +1 @@
-2.18.3
+2.18.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org