commit yast2-repair

24 May 2006

Hello community,

here is the log from the commit of package yast2-repair
checked in at Wed May 24 03:08:57 CEST 2006.

--------

--- yast2-repair/yast2-repair.changes	2006-03-20 11:20:23.000000000 +0100
+++ yast2-repair/yast2-repair.changes	2006-05-23 10:01:52.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 23 08:58:52 CEST 2006 - jsuchome@suse.cz
+
+- removed jfsutils from Requires (#177898)
+- 2.13.5 
+
+-------------------------------------------------------------------

Old:
----
  yast2-repair-2.13.4.tar.bz2

New:
----
  yast2-repair-2.13.5.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-repair.spec ++++++
--- /var/tmp/diff_new_pack.pdBtkc/_old	2006-05-24 03:08:49.000000000 +0200
+++ /var/tmp/diff_new_pack.pdBtkc/_new	2006-05-24 03:08:49.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-repair (Version 2.13.4)
+# spec file for package yast2-repair (Version 2.13.5)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,15 +11,15 @@
 # norootforbuild
 
 Name:           yast2-repair
-Version:        2.13.4
+Version:        2.13.5
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-repair-2.13.4.tar.bz2
+Source0:        yast2-repair-2.13.5.tar.bz2
 prefix:		/usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-testsuite
-Requires:       yast2 gpart jfsutils reiserfs e2fsprogs yast2-bootloader yast2-storage
+Requires:       yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage
 BuildArchitectures:	noarch
 Summary:        YaST2 - System Repair Tool
 
@@ -34,7 +34,7 @@
     Jiri Suchomel <jsuchome@suse.cz>
 
 %prep
-%setup -n yast2-repair-2.13.4
+%setup -n yast2-repair-2.13.5
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -69,6 +69,9 @@
 %doc %{prefix}/share/doc/packages/yast2-repair
 
 %changelog -n yast2-repair
+* Tue May 23 2006 - jsuchome@suse.cz
+- removed jfsutils from Requires (#177898)
+- 2.13.5
 * Mon Mar 20 2006 - jsuchome@suse.cz
 - allow root partition on LVM (#147377)
 - 2.13.4

++++++ yast2-repair-2.13.4.tar.bz2 -> yast2-repair-2.13.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.13.4/VERSION new/yast2-repair-2.13.5/VERSION
--- old/yast2-repair-2.13.4/VERSION	2006-03-20 10:51:27.000000000 +0100
+++ new/yast2-repair-2.13.5/VERSION	2006-05-23 08:59:11.000000000 +0200
@@ -1 +1 @@
-2.13.4
+2.13.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.13.4/src/OSRFsck.ycp new/yast2-repair-2.13.5/src/OSRFsck.ycp
--- old/yast2-repair-2.13.4/src/OSRFsck.ycp	2006-03-20 10:49:59.000000000 +0100
+++ new/yast2-repair-2.13.5/src/OSRFsck.ycp	2006-05-23 09:06:53.000000000 +0200
@@ -11,12 +11,13 @@
  *  Author:
  *    Johannes Buchhold <jbuch@suse.de>
  *
- * $Id: OSRFsck.ycp 25810 2005-10-06 06:12:39Z jsuchome $
+ * $Id: OSRFsck.ycp 29145 2006-03-20 10:20:42Z jsuchome $
  */
 {
   module "OSRFsck";
 
   import "FileSystems";
+  import "FileUtils";
   import "Storage";
   import "Partitions";
   import "Mode";
@@ -289,6 +290,12 @@
    */
   define boolean is_jfs()``{
 
+    if (!FileUtils::Exists ("/sbin/jfs_logdump"))
+    {
+	y2milestone ("/sbin/jfs_logdump not available, exiting check...");
+	return false;
+    }
+
     string command = sformat ("if /usr/bin/test -f %1; then /bin/rm %1; fi",
 	OSRLogFile::GetTmpDir() +"/jfslog.dmp" );
 
@@ -436,6 +443,12 @@
    */
   define boolean check_jfs()``{
 
+    if (!FileUtils::Exists ("/sbin/fsck.jfs"))
+    {
+	y2milestone ("/sbin/fsck.jfs not available, exiting check...");
+	return false;
+    }
+
     string command	= sformat("/sbin/fsck.jfs -n %1", check_partition);
     boolean checkjfs	= OSRExecute::Command(.local.bash, command);
     last_check_return	= OSRExecute::result;
@@ -745,6 +758,11 @@
    */
   define boolean repair_jfs()``{
 
+    if (!FileUtils::Exists ("/sbin/fsck.jfs"))
+    {
+	y2milestone ("/sbin/fsck.jfs not available, exiting repair...");
+	return false;
+    }
     string command	= sformat("/sbin/fsck.jfs -p %1", check_partition);
     boolean repairjfs	= OSRExecute::CommandProgress (
 	.local.bash, command, file_name);


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)