Hello community,
here is the log from the commit of package yast2-repair
checked in at Wed Mar 19 11:04:28 CET 2008.
--------
--- yast2-repair/yast2-repair.changes 2008-01-21 10:08:08.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-repair/yast2-repair.changes 2008-03-19 08:20:55.292775000 +0100
@@ -1,0 +2,14 @@
+Wed Mar 19 08:03:14 CET 2008 - jsuchome@suse.cz
+
+- yast2-storage required for build (bnc#359719)
+- fixed expert summary layout (bnc#366358)
+- fixed selection of minimal package set (bnc#366865)
+- do not show package progress in wizard window
+- 2.16.5
+
+-------------------------------------------------------------------
+Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz
+
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
+
+-------------------------------------------------------------------
Old:
----
yast2-repair-2.16.4.tar.bz2
New:
----
yast2-repair-2.16.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-repair.spec ++++++
--- /var/tmp/diff_new_pack.R22549/_old 2008-03-19 11:04:03.000000000 +0100
+++ /var/tmp/diff_new_pack.R22549/_new 2008-03-19 11:04:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-repair (Version 2.16.4)
+# spec file for package yast2-repair (Version 2.16.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,15 +10,16 @@
# norootforbuild
+
Name: yast2-repair
-Version: 2.16.4
+Version: 2.16.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-repair-2.16.4.tar.bz2
+Source0: yast2-repair-2.16.5.tar.bz2
Prefix: /usr
-BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-testsuite
+BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-storage yast2-testsuite
Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage
BuildArch: noarch
Summary: YaST2 - System Repair Tool
@@ -34,7 +35,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-repair-2.16.4
+%setup -n yast2-repair-2.16.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -68,6 +69,14 @@
/usr/share/YaST2/include/repair/*
%doc %{prefix}/share/doc/packages/yast2-repair
%changelog
+* Wed Mar 19 2008 jsuchome@suse.cz
+- yast2-storage required for build (bnc#359719)
+- fixed expert summary layout (bnc#366358)
+- fixed selection of minimal package set (bnc#366865)
+- do not show package progress in wizard window
+- 2.16.5
+* Mon Mar 17 2008 jsrain@suse.cz
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
* Mon Jan 21 2008 jsuchome@suse.cz
- check more return values of fsck.ext2 (#350540)
- 2.16.4
++++++ yast2-repair-2.16.4.tar.bz2 -> yast2-repair-2.16.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/src/bootmsg.desktop new/yast2-repair-2.16.5/src/bootmsg.desktop
--- old/yast2-repair-2.16.4/src/bootmsg.desktop 2007-06-06 12:53:28.000000000 +0200
+++ new/yast2-repair-2.16.5/src/bootmsg.desktop 2008-03-19 08:02:36.000000000 +0100
@@ -22,3 +22,4 @@
Name=Start-Up Log
GenericName=Display the boot log (/var/log/boot.msg)
X-KDE-SubstituteUID=true
+StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/src/messages.desktop new/yast2-repair-2.16.5/src/messages.desktop
--- old/yast2-repair-2.16.4/src/messages.desktop 2007-06-06 12:53:28.000000000 +0200
+++ new/yast2-repair-2.16.5/src/messages.desktop 2008-03-19 08:02:36.000000000 +0100
@@ -22,3 +22,4 @@
Name=System Log
GenericName=Display the system's log (/var/log/messages)
X-KDE-SubstituteUID=true
+StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/src/OSRCommon.ycp new/yast2-repair-2.16.5/src/OSRCommon.ycp
--- old/yast2-repair-2.16.4/src/OSRCommon.ycp 2007-06-06 12:54:42.000000000 +0200
+++ new/yast2-repair-2.16.5/src/OSRCommon.ycp 2008-03-07 08:51:00.000000000 +0100
@@ -26,6 +26,10 @@
textdomain "repair";
+
+// original value of progress status (before manipulation with our progress)
+global boolean progress_orig = true;
+
/**
* Functions that could be used as a default in lookups for functin pointers
* @return false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/src/OSRDirect.ycp new/yast2-repair-2.16.5/src/OSRDirect.ycp
--- old/yast2-repair-2.16.4/src/OSRDirect.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.16.5/src/OSRDirect.ycp 2008-03-07 08:58:48.000000000 +0100
@@ -101,17 +101,7 @@
string text = "";
foreach (string key, map data, (map >)direct_methods , ``{
- string item = "";
- if (UI::HasSpecialWidget(`DownloadProgress))
- {
- item = "<tr><th width=30 colspan=2> %1 </th><th></th></tr>"
- + "<tr> <td width=30> </th> <td width=370>%2</th></tr>"
- + "<tr><td> </th><td></th></tr>";
- }
- else
- {
- item = "<li>%1 </li> <li>%2 </li> <li> </li><br>";
- }
+ string item = "<li>%1 </li> <li>%2 </li> <li> </li><br>";
data["description"] = mergestring (
splitstring (data["description"]:"", "\n"), " ");
@@ -124,15 +114,7 @@
menu_button_items = add (menu_button_items,
`item (`id(key), data["button_text"]:""));
});
- if (UI::HasSpecialWidget(`DownloadProgress))
- {
- direct_items = add (direct_items,
- `RichText(`id(`options),sformat("<table>%1</table>",text)));
- }
- else
- {
- direct_items = add (direct_items,`RichText(`id(`options),text));
- }
+ direct_items = add (direct_items,`RichText(`id(`options),text));
direct_items = add (direct_items,
// menubutton label
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/src/OSRFsck.ycp new/yast2-repair-2.16.5/src/OSRFsck.ycp
--- old/yast2-repair-2.16.4/src/OSRFsck.ycp 2008-01-21 10:00:24.000000000 +0100
+++ new/yast2-repair-2.16.5/src/OSRFsck.ycp 2008-01-21 10:08:19.000000000 +0100
@@ -11,7 +11,7 @@
* Author:
* Johannes Buchhold
*
- * $Id: OSRFsck.ycp 37165 2007-03-28 13:02:37Z jsuchome $
+ * $Id: OSRFsck.ycp 43753 2008-01-21 09:08:18Z jsuchome $
*/
{
module "OSRFsck";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/src/osr_module_packages.ycp new/yast2-repair-2.16.5/src/osr_module_packages.ycp
--- old/yast2-repair-2.16.4/src/osr_module_packages.ycp 2007-03-01 15:40:42.000000000 +0100
+++ new/yast2-repair-2.16.5/src/osr_module_packages.ycp 2008-03-07 08:56:48.000000000 +0100
@@ -18,6 +18,7 @@
textdomain "repair";
import "Popup";
+ import "Progress";
import "Report";
import "Stage";
@@ -80,14 +81,13 @@
}
/**
- *
+ * Search for package database
*/
define boolean OSRPackagesDBFind() ``{
- /////////////////////////////////////////////////////////////////////////
- //
- //
- //
- /////////////////////////////////////////////////////////////////////////
+
+ // no package callbacks in wizard window
+ Progress::set (false);
+
if ( OSRPkg::CheckDB (OSRSystem::TargetRoot()))
{
// summary text
@@ -215,7 +215,14 @@
return OSRPackagesVerifyPackages ("all");
}
+ /**
+ * Direct method "Verify Installed Software" (from Expert tools)
+ */
define symbol OSRDirectPackageCheck()``{
+
+ // no package callbacks in wizard window
+ Progress::set (false);
+
symbol ret = `next;
// radio button label
string sret = _("Base Packages Only");
@@ -266,17 +273,21 @@
OSRFstab::Reset();
OSRPkg::Reset();
+ // progress was off due to package callbacks
+ Progress::set (OSRCommon::progress_orig);
y2milestone("Direct package check");
return ret;
}
/**
- * Reset boot loader temporary settings.
+ * Reset packager temporary settings.
*/
define boolean OSRPackagesReset() ``{
OSRSystem::SetOrgRoot();
OSRPkg::Reset();
+ // progress was off due to package callbacks
+ Progress::set (OSRCommon::progress_orig);
return true;
}
@@ -355,7 +366,7 @@
"packages_verify_base" :
$[
// module action label
- "text" : _("Verify Base Packages (time consuming)"),
+ "text" : _("Verify Base Packages"),
// helptext
"help" : sformat("
<P>%1</P>
@@ -491,26 +502,4 @@
- /*
- integer arg_n = 0;
- //////////////////////////////////////////////////////////////////////
- //
- // MAIN
- //
- //////////////////////////////////////////////////////////////////////
- while ( arg_n < size(WFM::Args()) )
- {
- if ( WFM::Args(arg_n) == .init )
- {
- y2milestone("Argument: %1", WFM::Args(arg_n));
- return OSRPackagesInit();
- }
- else
- {
- y2error("ERROR: unknown option %1", WFM::Args(arg_n) );
- return $[];
- }
- arg_n = arg_n + 1;
- }
- */
}//EOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/src/OSRPkg.ycp new/yast2-repair-2.16.5/src/OSRPkg.ycp
--- old/yast2-repair-2.16.4/src/OSRPkg.ycp 2008-01-07 15:38:28.000000000 +0100
+++ new/yast2-repair-2.16.5/src/OSRPkg.ycp 2008-03-07 08:53:43.000000000 +0100
@@ -200,7 +200,7 @@
}
if (minimal_selection == [] || minimal_selection == nil)
{
- DefaultDesktop::SetDesktop ("text");
+ DefaultDesktop::SetDesktop ("textmode");
list<string> pats = DefaultDesktop::PatternsToSelect ();
foreach (string p, pats, {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/src/OSRRepairUI.ycp new/yast2-repair-2.16.5/src/OSRRepairUI.ycp
--- old/yast2-repair-2.16.4/src/OSRRepairUI.ycp 2008-01-07 15:38:28.000000000 +0100
+++ new/yast2-repair-2.16.5/src/OSRRepairUI.ycp 2008-03-07 08:50:25.000000000 +0100
@@ -126,6 +126,8 @@
integer no_of_steps = 6;
+ OSRCommon::progress_orig = Progress::status ();
+
// We do not set help text here, because it was set outside
if(!OSRMode::script)
Progress::New ( init_dialog_caption, " ", no_of_steps,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.4/VERSION new/yast2-repair-2.16.5/VERSION
--- old/yast2-repair-2.16.4/VERSION 2008-01-21 10:01:55.000000000 +0100
+++ new/yast2-repair-2.16.5/VERSION 2008-03-19 08:09:07.000000000 +0100
@@ -1 +1 @@
-2.16.4
+2.16.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org