Hello community,
here is the log from the commit of package yast2-live-installer for openSUSE:Factory
checked in at Fri Jun 12 18:08:40 CEST 2009.
--------
--- yast2-live-installer/yast2-live-installer.changes 2009-05-07 16:00:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-live-installer/yast2-live-installer.changes 2009-06-11 13:56:16.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 11 13:40:23 CEST 2009 - jsrain@suse.cz
+
+- adapted for unified progress during live installation
+ (bnc#435680)
+- 2.18.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-live-installer-2.18.1.tar.bz2
New:
----
yast2-live-installer-2.18.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-live-installer.spec ++++++
--- /var/tmp/diff_new_pack.a32358/_old 2009-06-12 18:08:30.000000000 +0200
+++ /var/tmp/diff_new_pack.a32358/_new 2009-06-12 18:08:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-live-installer (Version 2.18.1)
+# spec file for package yast2-live-installer (Version 2.18.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,18 +19,20 @@
Name: yast2-live-installer
-Version: 2.18.1
+Version: 2.18.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-live-installer-2.18.1.tar.bz2
+Source0: yast2-live-installer-2.18.2.tar.bz2
Prefix: /usr
# Internet and InternetDevices
Requires: yast2 >= 2.16.6
Requires: yast2-network >= 2.16.6
Requires: yast2-bootloader >= 2.18.7
-Requires: yast2-bootloader yast2-country yast2-installation yast2-storage
+#unified progress
+Requires: yast2-installation >= 2.18.17
+Requires: yast2-bootloader yast2-country yast2-storage
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildArch: noarch
Summary: YaST2 - Installation from Live Media
@@ -46,7 +48,7 @@
Jiri Srain
%prep
-%setup -n yast2-live-installer-2.18.1
+%setup -n yast2-live-installer-2.18.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +78,10 @@
%{prefix}/share/applications/YaST2/live-installer.desktop
%doc %{prefix}/share/doc/packages/yast2-live-installer
%changelog
+* Thu Jun 11 2009 jsrain@suse.cz
+- adapted for unified progress during live installation
+ (bnc#435680)
+- 2.18.2
* Thu May 07 2009 jsrain@suse.cz
- adapted to changes in yast2-bootloader
- 2.18.1
++++++ yast2-live-installer-2.18.1.tar.bz2 -> yast2-live-installer-2.18.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.1/configure new/yast2-live-installer-2.18.2/configure
--- old/yast2-live-installer-2.18.1/configure 2009-05-07 15:59:16.000000000 +0200
+++ new/yast2-live-installer-2.18.2/configure 2009-06-11 13:55:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-live-installer 2.18.1.
+# Generated by GNU Autoconf 2.63 for yast2-live-installer 2.18.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-live-installer'
PACKAGE_TARNAME='yast2-live-installer'
-PACKAGE_VERSION='2.18.1'
-PACKAGE_STRING='yast2-live-installer 2.18.1'
+PACKAGE_VERSION='2.18.2'
+PACKAGE_STRING='yast2-live-installer 2.18.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1276,7 +1276,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-live-installer 2.18.1 to adapt to many kinds of systems.
+\`configure' configures yast2-live-installer 2.18.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1348,7 +1348,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-live-installer 2.18.1:";;
+ short | recursive ) echo "Configuration of yast2-live-installer 2.18.2:";;
esac
cat <<\_ACEOF
@@ -1428,7 +1428,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-live-installer configure 2.18.1
+yast2-live-installer configure 2.18.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1442,7 +1442,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-live-installer $as_me 2.18.1, which was
+It was created by yast2-live-installer $as_me 2.18.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2289,7 +2289,7 @@
# Define the identity of the package.
PACKAGE='yast2-live-installer'
- VERSION='2.18.1'
+ VERSION='2.18.2'
cat >>confdefs.h <<_ACEOF
@@ -2513,7 +2513,7 @@
-VERSION="2.18.1"
+VERSION="2.18.2"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
@@ -3547,7 +3547,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-live-installer $as_me 2.18.1, which was
+This file was extended by yast2-live-installer $as_me 2.18.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3597,7 +3597,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-live-installer config.status 2.18.1
+yast2-live-installer config.status 2.18.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.1/configure.in new/yast2-live-installer-2.18.2/configure.in
--- old/yast2-live-installer-2.18.1/configure.in 2009-05-07 15:59:10.000000000 +0200
+++ new/yast2-live-installer-2.18.2/configure.in 2009-06-11 13:55:39.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-live-installer, 2.18.1, http://bugs.opensuse.org/, yast2-live-installer)
+AC_INIT(yast2-live-installer, 2.18.2, http://bugs.opensuse.org/, yast2-live-installer)
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.2"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.1/live-installer.pot new/yast2-live-installer-2.18.2/live-installer.pot
--- old/yast2-live-installer-2.18.1/live-installer.pot 2009-03-06 08:44:05.000000000 +0100
+++ new/yast2-live-installer-2.18.2/live-installer.pot 2009-06-05 10:41:23.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-06 08:44+0100\n"
+"POT-Creation-Date: 2009-06-05 10:41+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.1/src/inst_live_doit.ycp new/yast2-live-installer-2.18.2/src/inst_live_doit.ycp
--- old/yast2-live-installer-2.18.1/src/inst_live_doit.ycp 2009-01-06 14:09:13.000000000 +0100
+++ new/yast2-live-installer-2.18.2/src/inst_live_doit.ycp 2009-06-11 12:21:10.000000000 +0200
@@ -11,6 +11,7 @@
import "Wizard";
import "ImageInstallation";
import "LiveInstaller";
+import "SlideShow";
Installation::destdir = "/mnt";
@@ -72,7 +73,10 @@
integer progress_step = (100-progress_start) * index / size (symlinks);
foreach (string link, string target, symlinks, {
index = index + 1;
- Progress::Title (sformat (_("Copying %1..."), link));
+ SlideShow::StageProgress( progress_start, nil);
+ SlideShow::SubProgress( 0, sformat (_("Copying %1..."), link));
+ SlideShow::AppendMessageToInstLog (sformat (_("Copying %1..."), link));
+// Progress::Title (sformat (_("Copying %1..."), link));
SCR::Execute (.target.remove, sformat ("%1/%2", Installation::destdir, link));
/*
list<string> components = splitstring (link, "/");
@@ -88,7 +92,9 @@
integer progress_done = progress_start + progress_step;
ImageInstallation::FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link), progress_start, progress_done);
progress_start = progress_done;
- Progress::Step (progress_start);
+// Progress::Step (progress_start);
+ SlideShow::StageProgress( progress_done, nil);
+ SlideShow::SubProgress( 100, nil);
});
return true;
}
@@ -104,7 +110,7 @@
SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", tmpdir, Installation::destdir));
return true;
}
-
+/*
Progress::New(
// Headline for last dialog of base installation: Install LILO etc.
_("Copying the Live Image to Hard Disk"),
@@ -119,18 +125,27 @@
Progress::NextStage ();
Progress::Title (_("Evaluating filesystems to copy..."));
+*/
+SlideShow::MoveToStage( "images" );
+SlideShow::StageProgress( 0, _("Evaluating filesystems to copy...") );
+SlideShow::AppendMessageToInstLog (_("Evaluating filesystems to copy..."));
map copy_map = LinksMap (LinksToCopyList ());
+SlideShow::SubProgress( 0, _("Copying root filesystem..."));
+SlideShow::AppendMessageToInstLog (_("Copying root filesystem..."));
+SlideShow::StageProgress( 5, _("Copying live image..."));
+/*
Progress::NextStageStep (5);
Progress::Title (_("Copying root filesystem..."));
+*/
integer steps = size (copy_map) + 1;
integer step_size = 95 / steps;
CopyRootImage (5, 5 + step_size);
-Progress::NextStageStep (10);
+//Progress::NextStageStep (10);
CopySymlinkedImage (copy_map, 5 + step_size);
-Progress::Finish();
-Progress::Title (_("Finished."));
+//Progress::Finish();
+//Progress::Title (_("Finished."));
// reenable sources/services before their status gets stored in the target system
Pkg::SourceEditSet (LiveInstaller::source_states);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.1/VERSION new/yast2-live-installer-2.18.2/VERSION
--- old/yast2-live-installer-2.18.1/VERSION 2009-05-07 15:41:45.000000000 +0200
+++ new/yast2-live-installer-2.18.2/VERSION 2009-06-11 13:40:35.000000000 +0200
@@ -1 +1 @@
-2.18.1
+2.18.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.1/yast2-live-installer-2.18.2/live-installer.pot new/yast2-live-installer-2.18.2/yast2-live-installer-2.18.2/live-installer.pot
--- old/yast2-live-installer-2.18.1/yast2-live-installer-2.18.2/live-installer.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-live-installer-2.18.2/yast2-live-installer-2.18.2/live-installer.pot 2009-06-05 10:41:23.000000000 +0200
@@ -0,0 +1,238 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-05 10:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/inst_live_add_base_repo.ycp:25 src/inst_live_sw_select.ycp:16
+msgid "Software Installation"
+msgstr ""
+
+#: src/inst_live_doit.ycp:75
+#, ycp-format
+msgid "Copying %1..."
+msgstr ""
+
+#. Headline for last dialog of base installation: Install LILO etc.
+#: src/inst_live_doit.ycp:110
+msgid "Copying the Live Image to Hard Disk"
+msgstr ""
+
+#: src/inst_live_doit.ycp:113
+msgid "Evaluate filesystems to copy"
+msgstr ""
+
+#: src/inst_live_doit.ycp:113
+msgid "Copy root filesystem"
+msgstr ""
+
+#: src/inst_live_doit.ycp:113
+msgid "Copy additional filesystems"
+msgstr ""
+
+#: src/inst_live_doit.ycp:121
+msgid "Evaluating filesystems to copy..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:124
+msgid "Copying root filesystem..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:133
+msgid "Finished."
+msgstr ""
+
+#. dialog caption
+#: src/inst_live_simple_proposal.ycp:22 src/inst_live_simple_proposal.ycp:155
+msgid "Installation settings"
+msgstr ""
+
+#. label
+#: src/inst_live_simple_proposal.ycp:24
+msgid "Analyzing the system..."
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:84
+#, ycp-format
+msgid "Use %1%% of disk %2 for Linux"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:88
+#, ycp-format
+msgid "Do not use disk %1"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:92
+msgid "Partitioning"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:109
+msgid "System start-up"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:111
+msgid "Ask whether to boot Linux or existing system"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:112
+msgid "Boot only Linux"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:113
+#, ycp-format
+msgid "System start time-out: %1 seconds"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:119
+msgid "Keyboard"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:126
+msgid "Time Zone"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:136
+msgid "Change Installation Settings"
+msgstr ""
+
+#. help text 1/3
+#: src/inst_live_simple_proposal.ycp:141
+msgid ""
+"<p>\n"
+"Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
+msgstr ""
+
+#. help text 2/3
+#: src/inst_live_simple_proposal.ycp:144
+msgid ""
+"<p>\n"
+"To change the values click the respective headline\n"
+"or select <b>Change Installation Settings</b></p>"
+msgstr ""
+
+#. help text 3/3
+#: src/inst_live_simple_proposal.ycp:148
+msgid ""
+"<p>\n"
+"Your hard disk has not been modified, you can still safely abort.\n"
+"</p>"
+msgstr ""
+
+#. help text 1/1
+#: src/inst_live_welcome.ycp:14
+msgid ""
+"<p>Welcome to the &product; installation.\n"
+"Press <b>Next</p> to run the installation wizard.</p>"
+msgstr ""
+
+#. dialog caption, %1 is product name (typically openSUSE)
+#: src/inst_live_welcome.ycp:19
+#, ycp-format
+msgid "Welcome to %1 installation"
+msgstr ""
+
+#. wellcome label, %1 is product name
+#: src/inst_live_welcome.ycp:21
+#, ycp-format
+msgid ""
+"Your %1 will be installed quickly\n"
+"and easily in a few steps.\n"
+"You will only have to answer some questions."
+msgstr ""
+
+#. TRANSLATORS: error message - the module does not provide command line interface
+#: src/live-installer.ycp:27
+msgid "There is no user interface available for this module."
+msgstr ""
+
+#. pop-up, %1 is memory size, currently hardcoded "1 GB"
+#: src/live-installer.ycp:40
+#, ycp-format
+msgid ""
+"Your computer has less than %1 of memory. This may not be\n"
+"sufficient for the live installation, especially when installing\n"
+"while running other applications.\n"
+"Before continuing, finish all running applications."
+msgstr ""
+
+#. continue/cancel pop-up
+#: src/live-installer.ycp:79
+msgid ""
+"YaST detected a mounted removable media. YaST cannot install\n"
+"the system on media which is mounted.\n"
+"To install the system on these media, unmount them first."
+msgstr ""
+
+#. continue-cancel popup
+#: src/live-installer.ycp:107
+msgid ""
+"openSUSE installer detected DMRAID array.\n"
+"It is not supported by the openSUSE live installer.\n"
+"Continuing the installation may cause data loss."
+msgstr ""
+
+#. popup dialog, text followed by 'Reboot Now' and 'Reboot Later' buttons
+#: src/live-installer.ycp:153
+msgid ""
+"The computer needs to be rebooted without the Live CD in the\n"
+"drive to finish the installation. Either YaST can reboot\n"
+"now or you can reboot any time later.\n"
+"\n"
+"Note that if the Live CD is not ejected, you can either eject\n"
+"it after the Live system shuts down or select \"Hard Disk\"\n"
+"in the boot menu of the Live CD."
+msgstr ""
+
+#. push button
+#: src/live-installer.ycp:161
+msgid "Reboot &Now"
+msgstr ""
+
+#: src/live-installer.ycp:161
+msgid "Reboot &Later"
+msgstr ""
+
+#. error report
+#: src/live-installer.ycp:176
+msgid ""
+"Failed to restart the computer.\n"
+"Reboot it manually. You may even need to push the\n"
+"'Reset' button to restart it."
+msgstr ""
+
+#. progress step title
+#: src/live_copy_files_finish.ycp:51
+msgid "Copying files to installed system..."
+msgstr ""
+
+#. progress step title
+#: src/live_runme_at_boot_finish.ycp:45
+msgid "Writing YaST Configuration..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:50
+msgid "Saving language..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:55
+msgid "Saving keyboard configuration..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:64
+msgid "Saving time zone..."
+msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org