Hello community,
here is the log from the commit of package yast2-installation
checked in at Sat Nov 8 20:39:18 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-11-05 17:29:48.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-11-07 17:22:18.000000000 +0100
@@ -1,0 +2,25 @@
+Fri Nov 7 16:32:28 CET 2008 - locilka@suse.cz
+
+- Fixed deploy_image_auto to handle AutoYaST settings correctly
+ (bnc #442691).
+- Removing the congrats dialog content before cloning, storing
+ the sources, finishing (bnc #441452).
+- Using Pkg::SourceProvideDigestedFile function when deploying
+ images and in release_notes_popup (bnc #409927).
+- 2.17.30
+
+-------------------------------------------------------------------
+Thu Nov 6 16:35:10 CET 2008 - locilka@suse.cz
+
+- Fixed progress (SlideShow) information about images being
+ deployed (bnc #442286).
+- Changing inst_deploy_images to use PackagesUI for opening a
+ package selector while debugging mode is turned on (bnc #435479).
+
+-------------------------------------------------------------------
+Thu Nov 6 16:19:59 CET 2008 - jsuchome@suse.cz
+
+- S09-cleanup: check for additional services requiring restart
+ (bnc#395402)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.17.29.tar.bz2
New:
----
yast2-installation-2.17.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.j26707/_old 2008-11-08 20:39:06.000000000 +0100
+++ /var/tmp/diff_new_pack.j26707/_new 2008-11-08 20:39:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.17.29)
+# spec file for package yast2-installation (Version 2.17.30)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,28 +19,32 @@
Name: yast2-installation
-Version: 2.17.29
+Version: 2.17.30
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.17.29.tar.bz2
+Source0: yast2-installation-2.17.30.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
# PackageCallbacks::RegisterEmptyProgressCallbacks()
BuildRequires: yast2 >= 2.16.52
+# Pkg::SourceProvideDigestedFile()
+BuildRequires: yast2-pkg-bindings >= 2.17.25
# Unified progress bar (done by visnov)
BuildRequires: yast2-packager >= 2.17.9
# AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1
-# PackagesProposal with `pattern(s)
-Requires: yast2 >= 2.17.38
+# PackagesUI::RunPackageSelector
+Requires: yast2 >= 2.17.40
# Required in in the first stage, after
# switching to the installed system, bugzilla #249679
Requires: yast2-bootloader
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
Requires: yast2-country-data >= 2.16.11
+# Pkg::SourceProvideDigestedFile()
+Conflicts: yast2-pkg-bindings < 2.17.25
# Packages::required_patterns
Requires: yast2-packager >= 2.17.23
# Storage::GetCommitInfo() call in include/misc.ycp
@@ -50,10 +54,9 @@
# Requires: yast2-network
# Requires: yast2-add-on
# Requires: yast2-update
-# extra sources in ResolvableProperties()
-# "", `language", "" in ResolvableProperties()
+# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile
# pkg-bindings are not directly required
-Conflicts: yast2-pkg-bindings < 2.13.101
+Conflicts: yast2-pkg-bindings < 2.17.25
# 'Product' and 'Installation' moved to 'yast2'
# needs NetworkService::isNetworkRunning() from yast2
Conflicts: yast2 < 2.15.35
@@ -115,7 +118,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.17.29
+%setup -n yast2-installation-2.17.30
%build
%{prefix}/bin/y2tool y2autoconf
@@ -184,6 +187,22 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Fri Nov 07 2008 locilka@suse.cz
+- Fixed deploy_image_auto to handle AutoYaST settings correctly
+ (bnc #442691).
+- Removing the congrats dialog content before cloning, storing
+ the sources, finishing (bnc #441452).
+- Using Pkg::SourceProvideDigestedFile function when deploying
+ images and in release_notes_popup (bnc #409927).
+- 2.17.30
+* Thu Nov 06 2008 locilka@suse.cz
+- Fixed progress (SlideShow) information about images being
+ deployed (bnc #442286).
+- Changing inst_deploy_images to use PackagesUI for opening a
+ package selector while debugging mode is turned on (bnc #435479).
+* Thu Nov 06 2008 jsuchome@suse.cz
+- S09-cleanup: check for additional services requiring restart
+ (bnc#395402)
* Wed Nov 05 2008 locilka@suse.cz
- Calling set_polkit_default_privs without checking for it using
FileUtils, checking by 'test -x' instead (bnc #440182).
++++++ yast2-installation-2.17.29.tar.bz2 -> yast2-installation-2.17.30.tar.bz2 ++++++
++++ 9202 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.17.29/configure.in new/yast2-installation-2.17.30/configure.in
--- old/yast2-installation-2.17.29/configure.in 2008-10-14 14:32:02.000000000 +0200
+++ new/yast2-installation-2.17.30/configure.in 2008-11-07 17:56:31.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.17.21, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.17.30, 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.17.21"
+VERSION="2.17.30"
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.17.29/src/clients/deploy_image_auto.ycp new/yast2-installation-2.17.30/src/clients/deploy_image_auto.ycp
--- old/yast2-installation-2.17.29/src/clients/deploy_image_auto.ycp 2008-10-14 14:23:08.000000000 +0200
+++ new/yast2-installation-2.17.30/src/clients/deploy_image_auto.ycp 2008-11-07 16:30:55.000000000 +0100
@@ -42,7 +42,9 @@
ret = true;
} else {
ret = false;
- y2warning ("Key image_installation not defined");
+ Installation::image_installation = true;
+ y2warning ("Key image_installation not defined, using image_installation: %1",
+ Installation::image_installation);
}
}
/**
@@ -150,8 +152,15 @@
* Write the configuration (prepare images, deploy images)
*/
else if (func == "Write") {
- WFM::call ("inst_prepare_image");
- WFM::call ("inst_deploy_image");
+ y2milestone ("Using images: %1", Installation::image_installation);
+
+ // BNC #442691
+ // Calling image_installation only if set to do so...
+ if (Installation::image_installation == true) {
+ WFM::call ("inst_prepare_image");
+ WFM::call ("inst_deploy_image");
+ }
+
ret = true;
}
/**
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.17.29/src/clients/inst_congratulate.ycp new/yast2-installation-2.17.30/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.17.29/src/clients/inst_congratulate.ycp 2008-10-14 14:23:08.000000000 +0200
+++ new/yast2-installation-2.17.30/src/clients/inst_congratulate.ycp 2008-11-07 16:57:30.000000000 +0100
@@ -6,7 +6,7 @@
*
* Display a congratulation message for the user.
*
- * $Id: inst_congratulate.ycp 48364 2008-06-17 13:13:36Z lslezak $
+ * $Id: inst_congratulate.ycp 53080 2008-11-07 15:57:54Z locilka $
*/
{
@@ -240,6 +240,13 @@
Wizard::RestoreNextButton ();
} else if (ret == `next) {
+ // BNC #441452
+ // Remove the congrats dialog
+
+ // Dialog busy message
+ Wizard::SetContents (caption, `Label(_("Finishing the installation...")), help,
+ GetInstArgs::enable_back(), GetInstArgs::enable_next());
+
if (UI::WidgetExists (`id (`turnoff_zmd)) && (boolean) UI::QueryWidget (`id (`turnoff_zmd), `Value))
StopAndDisableZMD();
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.17.29/src/clients/inst_deploy_image.ycp new/yast2-installation-2.17.30/src/clients/inst_deploy_image.ycp
--- old/yast2-installation-2.17.29/src/clients/inst_deploy_image.ycp 2008-10-27 16:27:25.000000000 +0100
+++ new/yast2-installation-2.17.30/src/clients/inst_deploy_image.ycp 2008-11-07 11:09:54.000000000 +0100
@@ -9,6 +9,7 @@
import "SlideShow";
import "Report";
import "ProductFeatures";
+import "PackagesUI";
textdomain "installation";
@@ -73,7 +74,6 @@
if (id != "deploying_images") {
string new_label = ImageInstallation::GetProgressLayoutLabel (id);
SlideShow::SubProgressStart( new_label );
- SlideShow::AppendMessageToInstLog( new_label );
}
_previous_id = id;
@@ -103,6 +103,7 @@
integer _steps_for_one_image = 100;
boolean download_handler_hit = false;
+string _last_image_downloading = nil;
boolean MyProgressDownloadHandler (integer percent, integer bps_avg, integer bps_current) {
// changing settings on the fly
@@ -118,6 +119,14 @@
if (_last_download_progress < percent) {
string image_info = current_image["name"]:"";
+
+ // BNC 442286, new image
+ // Sometimes it happens that the same image is logged twice
+ if (_last_image_downloading != image_info) {
+ y2milestone ("Downloading image: %1", image_info);
+ _last_image_downloading = image_info;
+ }
+
if (image_info == "") {
image_info = sformat (_("Downloading image at speed %1/s"), String::FormatSize (bps_current));
} else {
@@ -150,8 +159,11 @@
map current_image = ImageInstallation::GetCurrentImageDetails();
integer max_progress = current_image["max_progress"]:0;
+ boolean another_image = false;
+
// another file than the previous one
if (current_image["file"]:"" != _last_image_id) {
+ another_image = true;
_last_image_id = current_image["file"]:"";
_last_download_progress = -1;
_last_progress = -1;
@@ -169,14 +181,21 @@
// reset the label
if (x_progress == 0) {
string current_image_name = current_image["name"]:"";
+
if (current_image_name == "") {
current_image_name = _("Deploying image...");
} else {
current_image_name = sformat (_("Deploying image %1..."), current_image_name);
}
- // one image done
- SlideShow::SubProgressStart( current_image_name );
- SlideShow::AppendMessageToInstLog( current_image_name );
+
+ if (another_image == true) {
+ // one image done (another than the previous one)
+ // BNC #442286
+ SlideShow::SubProgressStart( current_image_name );
+ SlideShow::AppendMessageToInstLog( current_image_name );
+ } else {
+ y2warning ("The same image name again: %1 (100 * %2 / %3)", current_image_name, current_progress, max_progress);
+ }
}
// set current step
@@ -198,9 +217,7 @@
void RunPackageManager () {
y2milestone ("--- running the package manager ---");
- UI::OpenDialog (`opt(`defaultsize), `PackageSelector(`id (`packages), `opt (`summaryMode)));
- UI::RunPkgSelection (`id(`packages));
- UI::CloseDialog();
+ PackagesUI::RunPackageSelector ($["mode":`summaryMode]);
y2milestone ("--- running the package manager ---");
}
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.17.29/src/clients/release_notes_popup.ycp new/yast2-installation-2.17.30/src/clients/release_notes_popup.ycp
--- old/yast2-installation-2.17.29/src/clients/release_notes_popup.ycp 2008-10-14 14:23:08.000000000 +0200
+++ new/yast2-installation-2.17.30/src/clients/release_notes_popup.ycp 2008-11-07 17:22:41.000000000 +0100
@@ -6,7 +6,7 @@
*
* Display release notes.
*
- * $Id: release_notes_popup.ycp 50457 2008-08-28 13:20:46Z locilka $
+ * $Id: release_notes_popup.ycp 53086 2008-11-07 16:23:05Z locilka $
*/
{
@@ -46,18 +46,18 @@
y2debug ("Path template: %1", path_templ);
string tmp = sformat (path_templ, Language::language);
y2debug ("Trying to get %1", tmp);
- tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
+ tmp = Pkg::SourceProvideDigestedFile (source_id, 1, tmp, false);
if (tmp == nil)
{
tmp = sformat (path_templ, splitstring (Language::language, "_")[0]:"");
y2debug ("Trying to get %1", tmp);
- tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
+ tmp = Pkg::SourceProvideDigestedFile (source_id, 1, tmp, false);
}
if (tmp == nil)
{
tmp = sformat (path_templ, "en");
y2debug ("Trying to get %1", tmp);
- tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp);
+ tmp = Pkg::SourceProvideDigestedFile (source_id, 1, tmp, false);
}
if (tmp == nil)
return 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.17.29/src/modules/ImageInstallation.ycp new/yast2-installation-2.17.30/src/modules/ImageInstallation.ycp
--- old/yast2-installation-2.17.29/src/modules/ImageInstallation.ycp 2008-10-21 17:02:11.000000000 +0200
+++ new/yast2-installation-2.17.30/src/modules/ImageInstallation.ycp 2008-11-07 17:14:39.000000000 +0100
@@ -207,7 +207,10 @@
string file = _images[id, "file"]:"";
y2milestone ("Untarring image %1 (%2) to %3", id, file, target);
file = sformat ("%1/%2", _image_path, file);
- string image = Pkg::SourceProvideFile (_repo, 1, file);
+ // BNC #409927
+ // Checking files for signatures
+ string image = Pkg::SourceProvideDigestedFile (_repo, 1, file, false);
+
if (image == nil)
{
y2error ("File %1 not found on media", file);
@@ -306,7 +309,10 @@
string file = _images[id, "file"]:"";
y2milestone ("Deploying FS image %1 (%2) on %3", id, file, target);
file = sformat ("%1/%2", _image_path, file);
- string image = Pkg::SourceProvideFile (_repo, 1, file);
+ // BNC #409927
+ // Checking files for signatures
+ string image = Pkg::SourceProvideDigestedFile (_repo, 1, file, false);
+
if (image == nil)
{
y2error ("File %1 not found on media", file);
@@ -356,7 +362,10 @@
string file = _images[id, "file"]:"";
y2milestone ("Mounting image %1 (%2) on %3", id, file, target);
file = sformat ("%1/%2", _image_path, file);
- string image = Pkg::SourceProvideFile (_repo, 1, file);
+ // BNC #409927
+ // Checking files for signatures
+ string image = Pkg::SourceProvideDigestedFile (_repo, 1, file, false);
+
if (image == nil)
{
y2error ("File %1 not found on media", file);
@@ -493,7 +502,10 @@
];
foreach (string try_file, possible_files, {
- filename = Pkg::SourceProvideOptionalFile (_repo, 1, try_file);
+ // BNC #409927
+ // Checking files for signatures
+ filename = Pkg::SourceProvideDigestedFile (_repo, 1, try_file, true);
+
if (filename != nil && filename != "") {
y2milestone ("Using file: %1 (%2)", filename, try_file);
break;
@@ -626,7 +638,10 @@
_metadata_image = "";
// checking whether images are supported
- string filename = Pkg::SourceProvideOptionalFile (_repo, 1, sformat ("%1/images.xml", _image_path));
+ // BNC #409927
+ // Checking files for signatures
+ string filename = Pkg::SourceProvideDigestedFile (_repo, 1, sformat ("%1/images.xml", _image_path), false);
+
if (filename == nil)
{
Installation::image_installation = 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.17.29/startup/Second-Stage/S09-cleanup new/yast2-installation-2.17.30/startup/Second-Stage/S09-cleanup
--- old/yast2-installation-2.17.29/startup/Second-Stage/S09-cleanup 2008-10-14 14:23:10.000000000 +0200
+++ new/yast2-installation-2.17.30/startup/Second-Stage/S09-cleanup 2008-11-06 16:34:54.000000000 +0100
@@ -31,4 +31,12 @@
fi
fi
+# 13.5) restart other services if necessary (bnc#395402)
+if [ -f /var/lib/YaST2/restart_services ] ; then
+ cat /var/lib/YaST2/restart_services | while read service; do
+ log "\tRestart $service service..."
+ test -f /etc/init.d/$service && /etc/init.d/$service restart
+ done
+ rm -f /var/lib/YaST2/restart_services
+fi
stop_unicode
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.17.29/VERSION new/yast2-installation-2.17.30/VERSION
--- old/yast2-installation-2.17.29/VERSION 2008-11-05 17:29:53.000000000 +0100
+++ new/yast2-installation-2.17.30/VERSION 2008-11-06 16:32:30.000000000 +0100
@@ -1 +1 @@
-2.17.29
+2.17.30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org