Hello community,
here is the log from the commit of package yast2-repair
checked in at Wed Dec 20 19:00:55 CET 2006.
--------
--- yast2-repair/yast2-repair.changes 2006-11-06 11:38:29.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-repair/yast2-repair.changes 2006-12-20 14:15:51.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Dec 20 13:59:20 CET 2006 - jsuchome@suse.cz
+
+- use exit code of xfs_admin to check if partition is XFS (#228813)
+- text fixes to enable better translations
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-repair-2.14.0.tar.bz2
New:
----
yast2-repair-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-repair.spec ++++++
--- /var/tmp/diff_new_pack.vqre9N/_old 2006-12-20 19:00:19.000000000 +0100
+++ /var/tmp/diff_new_pack.vqre9N/_new 2006-12-20 19:00:19.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-repair (Version 2.14.0)
+# spec file for package yast2-repair (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-repair
-Version: 2.14.0
+Version: 2.15.0
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-repair-2.14.0.tar.bz2
+Source0: yast2-repair-2.15.0.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-testsuite
Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage
@@ -34,7 +34,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-repair-2.14.0
+%setup -n yast2-repair-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -69,6 +69,10 @@
%doc %{prefix}/share/doc/packages/yast2-repair
%changelog -n yast2-repair
+* Wed Dec 20 2006 - jsuchome@suse.cz
+- use exit code of xfs_admin to check if partition is XFS (#228813)
+- text fixes to enable better translations
+- 2.15.0
* Mon Nov 06 2006 - jsuchome@suse.cz
- new version for new product
- 2.14.0
++++++ yast2-repair-2.14.0.tar.bz2 -> yast2-repair-2.15.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.14.0/VERSION new/yast2-repair-2.15.0/VERSION
--- old/yast2-repair-2.14.0/VERSION 2006-11-06 11:33:55.000000000 +0100
+++ new/yast2-repair-2.15.0/VERSION 2006-12-20 13:59:59.000000000 +0100
@@ -1 +1 @@
-2.14.0
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.14.0/src/OSR.ycp new/yast2-repair-2.15.0/src/OSR.ycp
--- old/yast2-repair-2.14.0/src/OSR.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.15.0/src/OSR.ycp 2006-11-14 10:45:25.000000000 +0100
@@ -327,7 +327,7 @@
file \"osr_module_list.ycp\".
YaST system repair halts now!");
- // popup text: %1 is "System Repair" (translated)
+ // popup text: %1 is tool name ("System Repair" translated)
Report::Error(sformat(_("
Error during initialization.
Halting %1.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.14.0/src/OSRFsck.ycp new/yast2-repair-2.15.0/src/OSRFsck.ycp
--- old/yast2-repair-2.14.0/src/OSRFsck.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.15.0/src/OSRFsck.ycp 2006-12-20 13:58:52.000000000 +0100
@@ -260,26 +260,14 @@
boolean isxfs = OSRExecute::CommandOutput (
.local.bash, "/usr/sbin/xfs_admin -l -u " + check_partition);
- // failed
- //xfs_admin: unexpected XFS SB magic number 0xdd0a05a6
- //bad sb magic # 0xdd0a05a6 in AG 0
- //failed to read label in AG 0
- //bad sb magic # 0xdd0a05a6 in AG 0
- //failed to read UUID from AG 0
-
- // success
- //label = ""
- //uuid = ad743076-12b8-452b-86c0-2e62918479ae
- if (issubstring (OSRExecute::stdout, "label") &&
- issubstring (OSRExecute::stdout, "uuid" ))
+
+ if (isxfs)
{
y2milestone("partition %1 is xfs", check_partition);
- isxfs = true;
}
else
{
y2milestone("partition %1 is NOT xfs", check_partition);
- isxfs = false;
}
return isxfs;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.14.0/src/OSRPkg.ycp new/yast2-repair-2.15.0/src/OSRPkg.ycp
--- old/yast2-repair-2.14.0/src/OSRPkg.ycp 2006-09-26 14:43:44.000000000 +0200
+++ new/yast2-repair-2.15.0/src/OSRPkg.ycp 2006-11-13 16:05:23.000000000 +0100
@@ -755,7 +755,7 @@
_("
<P>&product; needs at least some packages for
basic system functionality. Without these
-packages, the system is not executable.</P>
+packages, the system might be not executable.</P>
") +
// check for package minimum help text 2/2, %1 is tool name
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.14.0/src/OSRPopup.ycp new/yast2-repair-2.15.0/src/OSRPopup.ycp
--- old/yast2-repair-2.14.0/src/OSRPopup.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.15.0/src/OSRPopup.ycp 2006-11-13 15:59:05.000000000 +0100
@@ -32,8 +32,8 @@
global string ignore_label = _("&Ignore");
global string help_label = Label::HelpButton();
- // dialog caption: "YaST system repair Help"
- global string help_headline = OSRCommon::tool_name + " " + _("Help");
+ // dialog caption: %1 is tool name ("System Repair")
+ global string help_headline = sformat (_("%1 Help"), OSRCommon::tool_name);
/**
* Sublayout for other layouts.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.14.0/src/OSRRepairUI.ycp new/yast2-repair-2.15.0/src/OSRRepairUI.ycp
--- old/yast2-repair-2.14.0/src/OSRRepairUI.ycp 2006-11-06 11:33:47.000000000 +0100
+++ new/yast2-repair-2.15.0/src/OSRRepairUI.ycp 2006-11-13 15:55:45.000000000 +0100
@@ -63,8 +63,9 @@
*/
global define void OSRRepairUI()``{
- // dialog caption, appended to tool name
- init_dialog_caption = OSRCommon::tool_name +" "+_("Initialization");
+ // dialog caption, %1 is tool name ("System Repair")
+ init_dialog_caption = sformat (_("%1 Initialization"),
+ OSRCommon::tool_name);
// dialog caption
start_dialog_caption = _("Repair Method");
// dialog caption
@@ -304,7 +305,7 @@
detected = false;
// summary help text 1/3
- string help_text = _("<p>The system repair
+ string help_text = _("<p>The system repair tool
can repair some parts of a damaged system. Therefore, the
tool scans the system and reports the errors found.</p>
") +
@@ -626,7 +627,7 @@
);
// Help text for automatic check/repair process 1/4
- string help_text = sformat(_("<p>Now checking your Linux system.</p>
+ string help_text = sformat(_("<p>Now checking your system.</p>
")) +
// Help text for automatic check/repair process 2/4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.14.0/src/osr_module_packages.ycp new/yast2-repair-2.15.0/src/osr_module_packages.ycp
--- old/yast2-repair-2.14.0/src/osr_module_packages.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.15.0/src/osr_module_packages.ycp 2006-11-14 10:44:13.000000000 +0100
@@ -115,7 +115,7 @@
// error text in summary
OSRSummary::DetectError ("", _("Different versions of products"));
OSRStatus::ErrorSeverityModuleBlocking ();
- // error popup, %1 is tool name
+ // error popup, %1 is tool name ('System repair')
Popup::Error (sformat (_("You are using %1 from a product
different than the installed one.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org