Hello community,
here is the log from the commit of package yast2-update
checked in at Tue Apr 29 23:06:58 CEST 2008.
--------
--- yast2-update/yast2-update.changes 2008-04-23 15:40:23.000000000 +0200
+++ yast2-update/yast2-update.changes 2008-04-29 13:32:06.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 29 13:31:05 CEST 2008 - locilka(a)suse.cz
+
+- Progress for "searching for partitions" (bnc #384707).
+- 2.16.8
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.16.7.tar.bz2
New:
----
yast2-update-2.16.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.I28043/_old 2008-04-29 23:06:15.000000000 +0200
+++ /var/tmp/diff_new_pack.I28043/_new 2008-04-29 23:06:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.16.7)
+# spec file for package yast2-update (Version 2.16.8)
#
# 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-update
-Version: 2.16.7
+Version: 2.16.8
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.16.7.tar.bz2
+Source0: yast2-update-2.16.8.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite
# Wizard::OpenOKDialog
@@ -73,7 +73,7 @@
Jiri Srain <jsrain(a)suse.cz>
%prep
-%setup -n yast2-update-2.16.7
+%setup -n yast2-update-2.16.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -120,6 +120,9 @@
/usr/share/YaST2/clients/update.ycp
/usr/share/YaST2/clients/run_update.ycp
%changelog
+* Tue Apr 29 2008 locilka(a)suse.cz
+- Progress for "searching for partitions" (bnc #384707).
+- 2.16.8
* Wed Apr 23 2008 locilka(a)suse.cz
- Added new client for run_update that does the real update, the
old update client is left to handle command-line or to call
++++++ yast2-update-2.16.7.tar.bz2 -> yast2-update-2.16.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.7/kernel-update-tool.pot new/yast2-update-2.16.8/kernel-update-tool.pot
--- old/yast2-update-2.16.7/kernel-update-tool.pot 2008-04-14 13:15:13.000000000 +0200
+++ new/yast2-update-2.16.8/kernel-update-tool.pot 2008-04-29 13:09:07.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 13:15+0200\n"
+"POT-Creation-Date: 2008-04-29 13:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.7/src/modules/RootPart.ycp new/yast2-update-2.16.8/src/modules/RootPart.ycp
--- old/yast2-update-2.16.7/src/modules/RootPart.ycp 2008-04-14 13:16:31.000000000 +0200
+++ new/yast2-update-2.16.8/src/modules/RootPart.ycp 2008-04-29 15:38:39.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 46567 2008-04-14 11:14:49Z locilka $
+ * $Id: RootPart.ycp 47161 2008-04-29 13:38:38Z locilka $
*/
{
module "RootPart";
@@ -1495,15 +1495,36 @@
Storage::ActivateEvms();
map <string, map> target_map = (map <string, map>) Storage::GetOndiskTarget ();
y2milestone ("target_map: %1", target_map);
-// target_map = (map <string, map>) Storage::GetTargetMap ();
-// y2milestone ("target_map: %1", target_map);
+
+ // prepare progress-bar
+ if (UI::WidgetExists (`id ("search_progress")))
+ UI::ReplaceWidget (
+ `id ("search_progress"),
+ `ProgressBar (
+ `id ("search_pb"),
+ _("Evaluating root partition. One moment please..."),
+ 100,
+ 0
+ )
+ );
rootPartitions = $[];
numberOfValidRootPartitions = 0;
+ // all partitions on all devices
+ integer max_steps = 0;
+ foreach (string device, map description, target_map, {
+ max_steps = max_steps + size (description["partitions"]:[]);
+ });
+
+ integer counter = 0;
foreach (string device, map description, target_map, {
foreach (map partition, description["partitions"]:[], {
+ counter = counter + 1;
+ if (UI::WidgetExists (`id ("search_progress")))
+ UI::ChangeWidget (`id ("search_pb"), `Value, (100 * counter / max_steps));
+
// some partitions don't make sense at all
if (partition["detected_fs"]:`unknown != `swap &&
partition["type"]:`primary != `extended)
@@ -1523,6 +1544,10 @@
});
});
+ // 100%
+ if (UI::WidgetExists (`id ("search_progress")))
+ UI::ChangeWidget (`id ("search_pb"), `Value, 100);
+
didSearchForRootPartitions = true;
y2milestone ("rootPartitions: %1", rootPartitions);
@@ -1549,15 +1574,19 @@
global void Detect () {
if (!didSearchForRootPartitions)
{
- // FIXME: can we use a Progress for that?
- UI::OpenDialog (`opt(`decorated ),
- // label
- `Label(_("Evaluating root partition. One moment please...")));
+ Wizard::SetContents (
+ // TRANSLATORS: dialog caption
+ _("Update Configuration"),
+ `VBox (
+ `ReplacePoint (`id ("search_progress"), `Empty())
+ ),
+ "",
+ false,
+ false
+ );
FindRootPartitions ();
- UI::CloseDialog ();
-
selectedRootPartition = "";
y2milestone ("Detected root partitions: %1", rootPartitions);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.7/update.pot new/yast2-update-2.16.8/update.pot
--- old/yast2-update-2.16.7/update.pot 2008-04-14 13:15:13.000000000 +0200
+++ new/yast2-update-2.16.8/update.pot 2008-04-29 13:09:07.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 13:15+0200\n"
+"POT-Creation-Date: 2008-04-29 13:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -129,7 +129,7 @@
#. screen title for update options
#. this is a heading
-#: src/clients/inst_update.ycp:26 src/clients/update_proposal.ycp:608
+#: src/clients/inst_update.ycp:26 src/clients/update_proposal.ycp:609
msgid "Update Options"
msgstr ""
@@ -159,7 +159,7 @@
#. label showing to which version we are updating
#. TRANSLATORS: proposal summary item, %1 is a product name
-#: src/clients/inst_update.ycp:78 src/clients/update_proposal.ycp:520
+#: src/clients/inst_update.ycp:78 src/clients/update_proposal.ycp:521
#, ycp-format
msgid "Update to %1"
msgstr ""
@@ -300,18 +300,18 @@
msgid "&Selected for Update"
msgstr ""
-#. TRANSLATORS: error message - the module does not provide command line interface
-#: src/clients/update.ycp:30
-msgid "There is no user interface available for this module."
+#: src/clients/run_update.ycp:36
+msgid "&Update"
msgstr ""
-#: src/clients/update.ycp:50
-msgid "&Update"
+#. TRANSLATORS: error message - the module does not provide command line interface
+#: src/clients/update.ycp:25
+msgid "There is no user interface available for this module."
msgstr ""
#. part of error popup message
#. error message in proposal
-#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:428
+#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:429
msgid "Cannot read the current RPM Database."
msgstr ""
@@ -322,7 +322,7 @@
msgstr ""
#. continue-cancel popup
-#: src/clients/update_proposal.ycp:350
+#: src/clients/update_proposal.ycp:351
msgid ""
"The installed product is not compatible with the product\n"
"on the installation media. If you try to update using the\n"
@@ -331,26 +331,26 @@
msgstr ""
#. error message in proposal
-#: src/clients/update_proposal.ycp:443
+#: src/clients/update_proposal.ycp:444
msgid "The installed product is not compatible with the product on the installation media."
msgstr ""
#. Can't find any software data, probably a installation media error
#. error message
-#: src/clients/update_proposal.ycp:454
+#: src/clients/update_proposal.ycp:455
msgid "Cannot read package data from installation media. Media error?"
msgstr ""
#. TRANSLATORS: unknown product (label)
#. TRANSLATORS: unknown product name
-#: src/clients/update_proposal.ycp:460 src/clients/update_proposal.ycp:468
-#: src/clients/update_proposal.ycp:497 src/clients/update_proposal.ycp:499
+#: src/clients/update_proposal.ycp:461 src/clients/update_proposal.ycp:469
+#: src/clients/update_proposal.ycp:498 src/clients/update_proposal.ycp:500
msgid "Unknown product"
msgstr ""
#. TRANSLATORS: proposal error, %1 is the version of installed system
#. %2 is the version being installed
-#: src/clients/update_proposal.ycp:480
+#: src/clients/update_proposal.ycp:481
#, ycp-format
msgid ""
"Updating system to another version (%1 -> %2) is not supported on the running system.<br>\n"
@@ -359,34 +359,34 @@
msgstr ""
#. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names
-#: src/clients/update_proposal.ycp:495
+#: src/clients/update_proposal.ycp:496
#, ycp-format
msgid "Warning: Updating from '%1' to '%2', products do not exactly match."
msgstr ""
#. Proposal for removing packages which are not maintained any more
-#: src/clients/update_proposal.ycp:526
+#: src/clients/update_proposal.ycp:527
msgid "Delete unmaintained packages"
msgstr ""
#. Proposal for backup during update
-#: src/clients/update_proposal.ycp:531
+#: src/clients/update_proposal.ycp:532
msgid "Only update installed packages"
msgstr ""
#. proposal string
-#: src/clients/update_proposal.ycp:539
+#: src/clients/update_proposal.ycp:540
msgid "Update based on patterns"
msgstr ""
#. Proposal for selection during update, %1 stands for selection name
-#: src/clients/update_proposal.ycp:555
+#: src/clients/update_proposal.ycp:556
#, ycp-format
msgid "Update based on selection \"%1\""
msgstr ""
#. TRANSLATORS: proposal dialog help
-#: src/clients/update_proposal.ycp:564
+#: src/clients/update_proposal.ycp:565
msgid ""
"<p><b><big>Update Options</big></b>\n"
"Here you can choose how your system is going to be updated.\n"
@@ -395,7 +395,7 @@
msgstr ""
#. this is a menu entry
-#: src/clients/update_proposal.ycp:610
+#: src/clients/update_proposal.ycp:611
msgid "&Update Options"
msgstr ""
@@ -533,7 +533,7 @@
#: src/modules/RootPart.ycp:94
#, ycp-format
msgid ""
-"See the SBD article at %1 for details\n"
+"See the SDB article at %1 for details\n"
"about how to solve this problem."
msgstr ""
@@ -696,8 +696,11 @@
msgid "Mounting partitions. One moment please..."
msgstr ""
-#. label
-#: src/modules/RootPart.ycp:1555
+#: src/modules/RootPart.ycp:1553
+msgid "xxx"
+msgstr ""
+
+#: src/modules/RootPart.ycp:1554
msgid "Evaluating root partition. One moment please..."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.7/VERSION new/yast2-update-2.16.8/VERSION
--- old/yast2-update-2.16.7/VERSION 2008-04-23 15:40:12.000000000 +0200
+++ new/yast2-update-2.16.8/VERSION 2008-04-29 13:32:12.000000000 +0200
@@ -1 +1 @@
-2.16.7
+2.16.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
