Hello community,
here is the log from the commit of package yast2-installation
checked in at Tue Apr 15 12:08:49 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-04-15 10:23:22.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-04-15 11:46:55.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 15 11:45:18 CEST 2008 - locilka@suse.cz
+
+- ImageInstallation tries to find details-<arch>.xml, then
+ details.xml to provide useful progress while deploying images.
+- 2.16.36
+
+-------------------------------------------------------------------
@@ -23 +30 @@
-- 2.13.34
+- 2.16.34
@@ -35 +42 @@
-- 2.13.33
+- 2.16.33
Old:
----
yast2-installation-2.16.35.tar.bz2
New:
----
yast2-installation-2.16.36.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.M11859/_old 2008-04-15 12:08:33.000000000 +0200
+++ /var/tmp/diff_new_pack.M11859/_new 2008-04-15 12:08:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.35)
+# spec file for package yast2-installation (Version 2.16.36)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-installation
-Version: 2.16.35
+Version: 2.16.36
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.35.tar.bz2
+Source0: yast2-installation-2.16.36.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
# anyxml -> barexml (bnc #366867)
@@ -106,7 +106,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.16.35
+%setup -n yast2-installation-2.16.36
%build
%{prefix}/bin/y2tool y2autoconf
@@ -172,6 +172,10 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Tue Apr 15 2008 locilka@suse.cz
+- ImageInstallation tries to find details-<arch>.xml, then
+ details.xml to provide useful progress while deploying images.
+- 2.16.36
* Tue Apr 15 2008 mvidner@suse.cz
- Enable printing the last few debugging log messages in the crash
handler, even if Y2DEBUG is not set (fate#302166).
@@ -186,13 +190,13 @@
- Caching system files in the System Analysis dialog.
- Some better texts (bnc #377959).
- Better text for Software Selection dialog (bnc #379157).
-- 2.13.34
+- 2.16.34
* Fri Apr 11 2008 locilka@suse.cz
- Changing Accept buttons to Install, Update and OK (FATE #120373).
* Fri Apr 11 2008 locilka@suse.cz
- Added another per-image progress into the Installation images
deployment (it requires details.xml).
-- 2.13.33
+- 2.16.33
* Fri Apr 11 2008 juhliarik@suse.cz
- Added loading kernel via kexec (fate #303395)
* Thu Apr 10 2008 locilka@suse.cz
++++++ yast2-installation-2.16.35.tar.bz2 -> yast2-installation-2.16.36.tar.bz2 ++++++
++++ 2864 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.16.35/configure.in new/yast2-installation-2.16.36/configure.in
--- old/yast2-installation-2.16.35/configure.in 2008-04-15 10:26:59.000000000 +0200
+++ new/yast2-installation-2.16.36/configure.in 2008-01-14 13:56:46.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.16.35, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.16.9, 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.16.35"
+VERSION="2.16.9"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -108,7 +108,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-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/yast2-installation-2.16.35/control/docs/control-doc.xml new/yast2-installation-2.16.36/control/docs/control-doc.xml
--- old/yast2-installation-2.16.35/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200
+++ new/yast2-installation-2.16.36/control/docs/control-doc.xml 2007-05-18 10:44:02.000000000 +0200
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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.16.35/src/modules/ImageInstallation.ycp new/yast2-installation-2.16.36/src/modules/ImageInstallation.ycp
--- old/yast2-installation-2.16.35/src/modules/ImageInstallation.ycp 2008-04-15 10:07:06.000000000 +0200
+++ new/yast2-installation-2.16.36/src/modules/ImageInstallation.ycp 2008-04-15 11:48:08.000000000 +0200
@@ -49,7 +49,7 @@
/**
* Template for the path for an image on the media
*/
-string _image_path = "/images/%1";
+string _image_path = "/images";
/**
* List of already mounted images
@@ -172,7 +172,7 @@
boolean DeployTarImage (string id, string target) {
string file = _images[id, "file"]:"";
y2milestone ("Untarring image %1 (%2) to %3", id, file, target);
- file = sformat (_image_path, file);
+ file = sformat ("%1/%2", _image_path, file);
string image = Pkg::SourceProvideFile (_repo, 1, file);
if (image == nil)
{
@@ -254,7 +254,7 @@
boolean DeployFsImage (string id, string target) {
string file = _images[id, "file"]:"";
y2milestone ("Deploying FS image %1 (%2) on %3", id, file, target);
- file = sformat (_image_path, file);
+ file = sformat ("%1/%2", _image_path, file);
string image = Pkg::SourceProvideFile (_repo, 1, file);
if (image == nil)
{
@@ -304,7 +304,7 @@
boolean MountFsImage (string id, string target) {
string file = _images[id, "file"]:"";
y2milestone ("Mounting image %1 (%2) on %3", id, file, target);
- file = sformat (_image_path, file);
+ file = sformat ("%1/%2", _image_path, file);
string image = Pkg::SourceProvideFile (_repo, 1, file);
if (image == nil)
{
@@ -415,7 +415,22 @@
* Loads non-mandatory details for every single selected image.
*/
global boolean FillUpImagesDetails () {
- string filename = Pkg::SourceProvideOptionalFile (_repo, 1, sformat (_image_path, "details.xml"));
+ // ppc (covers also ppc64), i386, x86_64 ...
+ string filename = nil;
+
+ list <string> possible_files = [
+ sformat ("%1/details-%2.xml", _image_path, Arch::arch_short()),
+ sformat ("%1/details.xml", _image_path),
+ ];
+
+ foreach (string try_file, possible_files, {
+ filename = Pkg::SourceProvideOptionalFile (_repo, 1, try_file);
+ if (filename != nil && filename != "") {
+ y2milestone ("Using file: %1 (%2)", filename, try_file);
+ break;
+ }
+ });
+
if (filename == nil) {
y2milestone ("No image installation details found");
return false;
@@ -513,7 +528,7 @@
_metadata_image = "";
// checking whether images are supported
- string filename = Pkg::SourceProvideOptionalFile (_repo, 1, sformat (_image_path, "images.xml"));
+ string filename = Pkg::SourceProvideOptionalFile (_repo, 1, sformat ("%1/images.xml", _image_path));
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.16.35/TODO new/yast2-installation-2.16.36/TODO
--- old/yast2-installation-2.16.35/TODO 2008-04-15 10:07:07.000000000 +0200
+++ new/yast2-installation-2.16.36/TODO 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-Deploying Images
-================
-
-* Improve deploying user-feedback
- - Untar images using .process agent with along with tar option --checkpoint
- - Add <size> tag to images to predict a better progress layout
- - Enable [Abort] functionality
-
-* Improve deploying speed and memory consumption
- - Try to optimize the tar archive
-
-* Bugs?
- - Fix metadata image (seems not to be used anymore or ignored?)
-
-* Missig documentation
- - Some new tags in control file
- - Document images.xml format
-
-* Installation proposal/overview
- - Provide a possibility to select another imageset or to ignore
- images completely
-
-Automatic Configuration
-=======================
-
-* Progress
- - Currently uses only one progress for all actions. Use that one progress
- plus use one another with 0-100% for every single proposal or
- set of scripts.
-
-General
-=======
-
-* Have a lot of fun! :) ;)
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.16.35/VERSION new/yast2-installation-2.16.36/VERSION
--- old/yast2-installation-2.16.35/VERSION 2008-04-15 10:20:57.000000000 +0200
+++ new/yast2-installation-2.16.36/VERSION 2008-04-15 11:44:45.000000000 +0200
@@ -1 +1 @@
-2.16.35
+2.16.36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org