Hello community,
here is the log from the commit of package yast2-storage
checked in at Wed Oct 3 01:11:10 CEST 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-09-24 15:53:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-10-02 19:22:05.459752000 +0200
@@ -1,0 +2,19 @@
+Tue Oct 02 18:44:07 CEST 2007 - aschnell@suse.de
+
+- fixed compiling with gcc 4.3
+
+-------------------------------------------------------------------
+Thu Sep 27 16:21:28 CEST 2007 - fehr@suse.de
+
+- fix wrong display of cryptotab instead of fstab
+- suppress install media when reading fstab (#327571)
+
+-------------------------------------------------------------------
+Wed Sep 26 12:00:06 CEST 2007 - fehr@suse.de
+
+- allow also device, uuid and label as default mount-by in
+ /etc/sysconfig/storage
+- make warning at start of yast2 disk suppressible
+- version 2.16.0
+
+-------------------------------------------------------------------
@@ -49 +68 @@
-- fix another case of nonzero passno for encrypted fstab
+- fix another case of nonzero passno for encrypted fstab
@@ -77 +96 @@
-- try a remount if fstab options change and umount/mount is not
+- try a remount if fstab options change and umount/mount is not
Old:
----
yast2-storage-2.15.27.tar.bz2
New:
----
yast2-storage-2.16.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.jw6689/_old 2007-10-03 01:11:03.000000000 +0200
+++ /var/tmp/diff_new_pack.jw6689/_new 2007-10-03 01:11:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.15.27)
+# spec file for package yast2-storage (Version 2.16.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-storage
-Version: 2.15.27
+Version: 2.16.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.15.27.tar.bz2
+Source0: yast2-storage-2.16.0.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
# Required only in inst-sys
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-storage-2.15.27
+%setup -n yast2-storage-2.16.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -173,6 +173,16 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Tue Oct 02 2007 - aschnell@suse.de
+- fixed compiling with gcc 4.3
+* Thu Sep 27 2007 - fehr@suse.de
+- fix wrong display of cryptotab instead of fstab
+- suppress install media when reading fstab (#327571)
+* Wed Sep 26 2007 - fehr@suse.de
+- allow also device, uuid and label as default mount-by in
+ /etc/sysconfig/storage
+- make warning at start of yast2 disk suppressible
+- version 2.16.0
* Mon Sep 24 2007 - fehr@suse.de
- prevent crash with invalid dmraid data (#327342)
- fix problem with removing cached mapping data (#327717)
++++++ yast2-storage-2.15.27.tar.bz2 -> yast2-storage-2.16.0.tar.bz2 ++++++
++++ 18107 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/agents-scr/cfg_storage.scr new/yast2-storage-2.16.0/agents-scr/cfg_storage.scr
--- old/yast2-storage-2.15.27/agents-scr/cfg_storage.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.16.0/agents-scr/cfg_storage.scr 2007-09-26 17:34:38.000000000 +0200
@@ -0,0 +1,21 @@
+/**
+ * File:
+ * cfg_storage.scr
+ * Summary:
+ * SCR Agent for reading/writing /etc/sysconfig/storage
+ * using the rc-agent
+ * Access:
+ * read/write
+ * Authors:
+ * Thomas Fehr
+ *
+ * $Id: cfg_sound.scr 13018 2003-12-11 12:52:53Z jhumpol $
+ *
+ * Read/Sets the values defined in <tt>/etc/sysconfig/storage</tt>
+ * in an easy manner.
+ */
+.sysconfig.storage
+
+`ag_ini(
+ `SysConfigFile("/etc/sysconfig/storage")
+)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/agents-scr/Makefile.am new/yast2-storage-2.16.0/agents-scr/Makefile.am
--- old/yast2-storage-2.15.27/agents-scr/Makefile.am 2007-05-23 12:45:16.000000000 +0200
+++ new/yast2-storage-2.16.0/agents-scr/Makefile.am 2007-09-26 17:34:38.000000000 +0200
@@ -1,7 +1,7 @@
#
# Makefile.am for storage/agents
#
-# $Id: Makefile.am 37212 2007-03-30 06:30:45Z locilka $
+# $Id: Makefile.am 41105 2007-09-26 10:46:29Z fehr $
#
scrconf_DATA = etc_cryptotab.scr \
@@ -9,6 +9,7 @@
proc_partitions.scr \
dasddev.scr \
etc_mtab.scr \
+ cfg_storage.scr \
run_swapon_s.scr
EXTRA_DIST = $(scrconf_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/configure.in new/yast2-storage-2.16.0/configure.in
--- old/yast2-storage-2.15.27/configure.in 2007-08-28 15:50:45.000000000 +0200
+++ new/yast2-storage-2.16.0/configure.in 2007-09-26 17:34:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.15.22, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.16.0, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.22"
+VERSION="2.16.0"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/data/sysconfig.storage new/yast2-storage-2.16.0/data/sysconfig.storage
--- old/yast2-storage-2.15.27/data/sysconfig.storage 2007-08-15 16:15:24.000000000 +0200
+++ new/yast2-storage-2.16.0/data/sysconfig.storage 2007-09-26 17:34:38.000000000 +0200
@@ -7,3 +7,11 @@
## Type: string
# List of used filesystem types.
USED_FS_LIST=""
+
+## Type: string(id,path,device,uuid,label)
+# List of possible default mount-by methods
+DEVICE_NAMES="id"
+
+## Type: integer(0:1)
+# Show warning at start of yast2 disk
+WARN_EXPERT="1"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/disk/src/disk.ycp new/yast2-storage-2.16.0/disk/src/disk.ycp
--- old/yast2-storage-2.15.27/disk/src/disk.ycp 2007-07-24 16:09:34.000000000 +0200
+++ new/yast2-storage-2.16.0/disk/src/disk.ycp 2007-09-26 17:34:38.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Michael Hager
*
- * $Id: disk.ycp 39641 2007-07-24 14:09:33Z fehr $
+ * $Id: disk.ycp 41105 2007-09-26 10:46:29Z fehr $
*
* Wrapper file for inst_disk.ycp
*
@@ -27,6 +27,7 @@
import "Popup";
import "Wizard";
+ import "Misc";
string msg=_("Only use this program if you are familiar with partitioning hard disks.
@@ -54,7 +55,11 @@
ret = `back;
// popup headline
- if (Popup::YesNoHeadline(_("Warning"),msg)==true) {
+ integer warn = tointeger(Misc::SysconfigRead( .sysconfig.storage.WARN_EXPERT, "1" ));
+ y2milestone( "warn:%1", warn );
+ if( warn==nil )
+ warn = 1;
+ if (warn==0||Popup::YesNoHeadline(_("Warning"),msg)==true) {
y2milestone ("--- Calling disk_worker %1 ---", WFM::Args());
ret = WFM::call("disk_worker", WFM::Args());
y2milestone ("--- Returned: %1 ---", ret);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/AppUtil.h new/yast2-storage-2.16.0/libstorage/src/AppUtil.h
--- old/yast2-storage-2.15.27/libstorage/src/AppUtil.h 2007-07-25 19:55:43.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/AppUtil.h 2007-10-02 12:09:19.000000000 +0200
@@ -6,6 +6,7 @@
#include
#include
+#include
#include <cstdarg>
#include <cstdio>
#include <fstream>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Container.h new/yast2-storage-2.16.0/libstorage/src/Container.h
--- old/yast2-storage-2.15.27/libstorage/src/Container.h 2007-07-18 13:52:29.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Container.h 2007-10-02 17:45:29.000000000 +0200
@@ -132,7 +132,7 @@
public:
Container( Storage * const, const string& Name, storage::CType typ );
Container( const Container& );
- Storage * const getStorage() const { return sto; }
+ Storage * getStorage() const { return sto; }
virtual ~Container();
const string& name() const { return nm; }
const string& device() const { return dev; }
@@ -154,7 +154,7 @@
virtual string createText(bool doing=true) const;
virtual int resizeVolume( Volume* v, unsigned long long newSize );
virtual int removeVolume( Volume* v );
- static storage::CType const staticType() { return storage::CUNKNOWN; }
+ static storage::CType staticType() { return storage::CUNKNOWN; }
friend std::ostream& operator<< (std::ostream& s, const Container &c );
virtual Container* getCopy() const { return( new Container( *this ) ); }
bool compareContainer( const Container* c, bool verbose ) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Disk.h new/yast2-storage-2.16.0/libstorage/src/Disk.h
--- old/yast2-storage-2.15.27/libstorage/src/Disk.h 2007-07-18 12:38:03.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Disk.h 2007-10-02 17:45:29.000000000 +0200
@@ -55,7 +55,7 @@
bool isDasd() const { return( nm.find("dasd")==0 ); }
bool isLogical( unsigned nr ) const;
bool detect( ProcPart& ppart );
- static storage::CType const staticType() { return storage::DISK; }
+ static storage::CType staticType() { return storage::DISK; }
friend std::ostream& operator<< (std::ostream&, const Disk& );
void triggerUdevUpdate();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Dm.cc new/yast2-storage-2.16.0/libstorage/src/Dm.cc
--- old/yast2-storage-2.15.27/libstorage/src/Dm.cc 2007-09-24 11:30:47.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Dm.cc 2007-10-02 17:45:29.000000000 +0200
@@ -314,7 +314,7 @@
num = mnr;
}
-const PeContainer* const Dm::pec() const
+const PeContainer* Dm::pec() const
{
return(dynamic_cast(cont));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/DmCo.h new/yast2-storage-2.16.0/libstorage/src/DmCo.h
--- old/yast2-storage-2.15.27/libstorage/src/DmCo.h 2007-07-18 12:39:47.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/DmCo.h 2007-10-02 17:45:29.000000000 +0200
@@ -16,7 +16,7 @@
DmCo( Storage * const s, bool detect, ProcPart& ppart );
DmCo( const DmCo& rhs );
virtual ~DmCo();
- static storage::CType const staticType() { return storage::DM; }
+ static storage::CType staticType() { return storage::DM; }
friend std::ostream& operator<< (std::ostream&, const DmCo& );
bool equalContent( const Container& rhs ) const;
void logDifference( const Container& d ) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Dm.h new/yast2-storage-2.16.0/libstorage/src/Dm.h
--- old/yast2-storage-2.15.27/libstorage/src/Dm.h 2007-06-20 17:33:49.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Dm.h 2007-10-02 17:45:29.000000000 +0200
@@ -15,7 +15,7 @@
public:
Dm( const PeContainer& d, const string& tn );
Dm( const PeContainer& d, const string& tn, unsigned mnum );
- Dm( const PeContainer& d, const Dm& d );
+ Dm( const PeContainer& d, const Dm& rhs );
Dm& operator=( const Dm& );
virtual ~Dm();
@@ -62,7 +62,7 @@
protected:
void init();
- const PeContainer* const pec() const;
+ const PeContainer* pec() const;
virtual const string shortPrintedName() const { return( "Dm" ); }
string getDevice( const string& majmin );
static void getDmMajor();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/DmPartCo.h new/yast2-storage-2.16.0/libstorage/src/DmPartCo.h
--- old/yast2-storage-2.15.27/libstorage/src/DmPartCo.h 2007-07-23 13:42:00.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/DmPartCo.h 2007-10-02 17:45:29.000000000 +0200
@@ -31,7 +31,7 @@
const string& udevPath() const { return udev_path; }
const std::list<string>& udevId() const { return udev_id; }
unsigned numPartitions() const { return disk->numPartitions(); }
- static storage::CType const staticType() { return storage::DMRAID; }
+ static storage::CType staticType() { return storage::DMRAID; }
friend std::ostream& operator<< (std::ostream&, const DmPartCo& );
void setUdevData( const string& id );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/DmraidCo.h new/yast2-storage-2.16.0/libstorage/src/DmraidCo.h
--- old/yast2-storage-2.15.27/libstorage/src/DmraidCo.h 2007-07-23 13:43:10.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/DmraidCo.h 2007-10-02 17:45:29.000000000 +0200
@@ -25,7 +25,7 @@
DmraidCo( const DmraidCo& rhs );
virtual ~DmraidCo();
- static storage::CType const staticType() { return storage::DMRAID; }
+ static storage::CType staticType() { return storage::DMRAID; }
friend std::ostream& operator<< (std::ostream&, const DmraidCo& );
void getInfo( storage::DmraidCoInfo& info ) const;
void setUdevData( const string& id );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/EvmsAccess.cc new/yast2-storage-2.16.0/libstorage/src/EvmsAccess.cc
--- old/yast2-storage-2.15.27/libstorage/src/EvmsAccess.cc 2007-07-24 16:01:03.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/EvmsAccess.cc 2007-10-02 17:45:29.000000000 +0200
@@ -775,7 +775,7 @@
}
}
-EvmsObject *const EvmsAccess::addObject( object_handle_t id )
+EvmsObject * EvmsAccess::addObject( object_handle_t id )
{
EvmsObject * ret;
if( (ret=find( id )) == NULL )
@@ -828,7 +828,7 @@
return( ret );
}
-EvmsObject *const EvmsAccess::find( object_handle_t id )
+EvmsObject * EvmsAccess::find( object_handle_t id )
{
EvmsObject *ret = NULL;
list::const_iterator Ptr_Ci = objects.begin();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/EvmsAccess.h new/yast2-storage-2.16.0/libstorage/src/EvmsAccess.h
--- old/yast2-storage-2.15.27/libstorage/src/EvmsAccess.h 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/EvmsAccess.h 2007-10-02 17:45:29.000000000 +0200
@@ -33,7 +33,7 @@
ObjType type() const { return typ; };
const string& name() const { return nam; };
- const object_handle_t id() const { return idt; };
+ object_handle_t id() const { return idt; };
void disownPtr() { own_ptr = false; };
void output( std::ostream& Stream ) const;
@@ -61,8 +61,8 @@
public:
EvmsDataObject( EvmsObject *const obj );
EvmsDataObject( object_handle_t id );
- const EvmsObject *const consumedBy() const { return consumed; };
- const EvmsObject *const volume() const { return vol; };
+ const EvmsObject * consumedBy() const { return consumed; };
+ const EvmsObject * volume() const { return vol; };
void output( std::ostream& Stream ) const;
virtual void addRelation( EvmsAccess* Acc );
@@ -141,8 +141,8 @@
class EvmsAccess
{
public:
- EvmsObject *const addObject( object_handle_t id );
- EvmsObject *const find( object_handle_t id );
+ EvmsObject * addObject( object_handle_t id );
+ EvmsObject * find( object_handle_t id );
EvmsAccess();
~EvmsAccess();
void output( std::ostream &Stream ) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Evms.cc new/yast2-storage-2.16.0/libstorage/src/Evms.cc
--- old/yast2-storage-2.15.27/libstorage/src/Evms.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Evms.cc 2007-10-02 17:45:29.000000000 +0200
@@ -86,7 +86,7 @@
}
}
-const EvmsCo* const Evms::evmsCo() const
+const EvmsCo* Evms::evmsCo() const
{
return(dynamic_cast(cont));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/EvmsCo.h new/yast2-storage-2.16.0/libstorage/src/EvmsCo.h
--- old/yast2-storage-2.15.27/libstorage/src/EvmsCo.h 2007-07-18 12:40:04.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/EvmsCo.h 2007-10-02 17:45:29.000000000 +0200
@@ -92,7 +92,7 @@
unsigned numVol() const { return vols.size(); }
bool lvm2() const { return( !lvm1 ); }
bool isContainer() const { return( container ); }
- static storage::CType const staticType() { return storage::EVMS; }
+ static storage::CType staticType() { return storage::EVMS; }
friend std::ostream& operator<< (std::ostream&, const EvmsCo& );
int removeCo();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Evms.h new/yast2-storage-2.16.0/libstorage/src/Evms.h
--- old/yast2-storage-2.15.27/libstorage/src/Evms.h 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Evms.h 2007-10-02 17:45:29.000000000 +0200
@@ -13,7 +13,7 @@
public:
Evms( const EvmsCo& d, const string& name, unsigned long long le, unsigned stripe );
Evms( const EvmsCo& d, const string& name, unsigned long long le, bool native );
- Evms( const EvmsCo& d, const Evms& d );
+ Evms( const EvmsCo& d, const Evms& rhs );
virtual ~Evms();
unsigned compatible() const { return compat; }
@@ -28,7 +28,7 @@
void getInfo(storage::EvmsInfo&) const;
bool equalContent( const Evms& rhs ) const;
void logDifference( const Evms& d ) const;
- const EvmsCo* const evmsCo() const;
+ const EvmsCo* evmsCo() const;
protected:
void init( const string& name );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/LoopCo.h new/yast2-storage-2.16.0/libstorage/src/LoopCo.h
--- old/yast2-storage-2.15.27/libstorage/src/LoopCo.h 2007-09-18 13:49:59.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/LoopCo.h 2007-10-02 17:45:29.000000000 +0200
@@ -17,7 +17,7 @@
LoopCo( const LoopCo& rhs );
virtual ~LoopCo();
- static storage::CType const staticType() { return storage::LOOP; }
+ static storage::CType staticType() { return storage::LOOP; }
friend std::ostream& operator<< (std::ostream&, const LoopCo& );
int createLoop( const string& file, bool reuseExisting,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Loop.h new/yast2-storage-2.16.0/libstorage/src/Loop.h
--- old/yast2-storage-2.15.27/libstorage/src/Loop.h 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Loop.h 2007-10-02 10:23:52.000000000 +0200
@@ -12,11 +12,11 @@
{
public:
Loop( const LoopCo& d, const string& LoopDev, const string& LoopFile,
- bool dmcrypt, const string& dm_dev,
+ bool dmcrypt, const string& dm_dev,
ProcPart& ppart, SystemCmd& losetup );
Loop( const LoopCo& d, const string& file, bool reuseExisting,
unsigned long long sizeK, bool dmcr );
- Loop( const LoopCo& d, const Loop& d );
+ Loop( const LoopCo& d, const Loop& rhs );
virtual ~Loop();
const string& loopFile() const { return lfile; }
void setLoopFile( const string& file );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/LvmVg.h new/yast2-storage-2.16.0/libstorage/src/LvmVg.h
--- old/yast2-storage-2.15.27/libstorage/src/LvmVg.h 2007-07-18 12:39:26.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/LvmVg.h 2007-10-02 17:45:29.000000000 +0200
@@ -19,7 +19,7 @@
unsigned numLv() const { return vols.size(); }
bool lvm2() const { return( !lvm1 ); }
bool inactive() const { return( inactiv ); }
- static storage::CType const staticType() { return storage::LVM; }
+ static storage::CType staticType() { return storage::LVM; }
friend std::ostream& operator<< (std::ostream&, const LvmVg& );
int removeVg();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/MdCo.h new/yast2-storage-2.16.0/libstorage/src/MdCo.h
--- old/yast2-storage-2.15.27/libstorage/src/MdCo.h 2007-09-13 12:17:49.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/MdCo.h 2007-10-02 17:45:29.000000000 +0200
@@ -18,7 +18,7 @@
MdCo( const MdCo& rhs );
virtual ~MdCo();
- static storage::CType const staticType() { return storage::MD; }
+ static storage::CType staticType() { return storage::MD; }
friend std::ostream& operator<< (std::ostream&, const MdCo& );
int createMd( unsigned num, storage::MdType type,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/NfsCo.h new/yast2-storage-2.16.0/libstorage/src/NfsCo.h
--- old/yast2-storage-2.15.27/libstorage/src/NfsCo.h 2007-07-26 12:25:27.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/NfsCo.h 2007-10-02 17:45:29.000000000 +0200
@@ -16,7 +16,7 @@
NfsCo( const NfsCo& rhs );
virtual ~NfsCo();
- static storage::CType const staticType() { return storage::NFSC; }
+ static storage::CType staticType() { return storage::NFSC; }
friend std::ostream& operator<< ( std::ostream&, const NfsCo& );
int addNfs( const string& nfsDev, unsigned long long sizeK,
const string& mp );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Nfs.h new/yast2-storage-2.16.0/libstorage/src/Nfs.h
--- old/yast2-storage-2.15.27/libstorage/src/Nfs.h 2007-07-26 12:37:33.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Nfs.h 2007-10-02 10:06:02.000000000 +0200
@@ -11,7 +11,7 @@
{
public:
Nfs( const NfsCo& d, const string& NfsDev );
- Nfs( const NfsCo& d, const Nfs& d );
+ Nfs( const NfsCo& d, const Nfs& rhs );
virtual ~Nfs();
friend std::ostream& operator<< (std::ostream& s, const Nfs& l );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Partition.cc new/yast2-storage-2.16.0/libstorage/src/Partition.cc
--- old/yast2-storage-2.15.27/libstorage/src/Partition.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Partition.cc 2007-10-02 17:45:29.000000000 +0200
@@ -283,7 +283,7 @@
return( txt );
}
-const Disk* const Partition::disk() const
+const Disk* Partition::disk() const
{
return(dynamic_cast(cont));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Partition.h new/yast2-storage-2.16.0/libstorage/src/Partition.h
--- old/yast2-storage-2.15.27/libstorage/src/Partition.h 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Partition.h 2007-10-02 17:45:29.000000000 +0200
@@ -57,7 +57,7 @@
string setTypeText( bool doing=true ) const;
int setFormat( bool format=true, storage::FsType fs=storage::REISERFS );
int changeMount( const string& val );
- const Disk* const disk() const;
+ const Disk* disk() const;
bool isWindows() const;
friend std::ostream& operator<< (std::ostream& s, const Partition &p );
static bool notDeleted( const Partition&d ) { return( !d.deleted() ); }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Storage.cc new/yast2-storage-2.16.0/libstorage/src/Storage.cc
--- old/yast2-storage-2.15.27/libstorage/src/Storage.cc 2007-09-20 14:56:00.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Storage.cc 2007-10-02 19:12:48.000000000 +0200
@@ -166,6 +166,12 @@
setDefaultMountBy( MOUNTBY_ID );
else if( val == "path" )
setDefaultMountBy( MOUNTBY_PATH );
+ else if( val == "device" )
+ setDefaultMountBy( MOUNTBY_DEVICE );
+ else if( val == "uuid" )
+ setDefaultMountBy( MOUNTBY_UUID );
+ else if( val == "label" )
+ setDefaultMountBy( MOUNTBY_LABEL );
}
}
}
@@ -1760,7 +1766,7 @@
ret = i->initializeDisk( value );
}
}
- if( ret==0 & !done )
+ if( ret==0 && !done )
{
DmPartCoIterator i = findDmPartCo( disk );
if( i != dmpCoEnd() )
@@ -1769,7 +1775,7 @@
ret = DISK_INIT_NOT_POSSIBLE;
}
}
- if( ret==0 & !done )
+ if( ret==0 && !done )
{
ret = STORAGE_DISK_NOT_FOUND;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/SystemCmd.cc new/yast2-storage-2.16.0/libstorage/src/SystemCmd.cc
--- old/yast2-storage-2.15.27/libstorage/src/SystemCmd.cc 2007-08-09 15:28:53.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/SystemCmd.cc 2007-10-02 12:09:19.000000000 +0200
@@ -3,6 +3,7 @@
Textdomain "storage"
*/
+#include
#include
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/src/Volume.h new/yast2-storage-2.16.0/libstorage/src/Volume.h
--- old/yast2-storage-2.15.27/libstorage/src/Volume.h 2007-09-18 14:42:13.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/src/Volume.h 2007-10-02 10:07:16.000000000 +0200
@@ -157,7 +157,9 @@
string sizeString() const;
string bootMount() const;
bool optNoauto() const;
- bool inCryptotab() const { return( encryption!=ENC_LUKS && !optNoauto() ); }
+ bool inCryptotab() const { return( encryption!=ENC_NONE &&
+ encryption!=ENC_LUKS &&
+ !optNoauto() ); }
bool inCrypttab() const { return( encryption==ENC_LUKS && !optNoauto() ); }
virtual void print( std::ostream& s ) const { s << *this; }
int getFreeLoop();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/common.cc new/yast2-storage-2.16.0/libstorage/testsuite/common.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/common.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/common.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/evms_create.cc new/yast2-storage-2.16.0/libstorage/testsuite/evms_create.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/evms_create.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/evms_create.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,3 +1,5 @@
+
+#include
#include <iostream>
#include <iterator>
#include <sstream>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/evms_extend.cc new/yast2-storage-2.16.0/libstorage/testsuite/evms_extend.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/evms_extend.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/evms_extend.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,3 +1,5 @@
+
+#include
#include <iostream>
#include <iterator>
#include <sstream>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/format1.cc new/yast2-storage-2.16.0/libstorage/testsuite/format1.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/format1.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/format1.cc 2007-10-02 17:44:26.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include <iostream>
#include <iterator>
@@ -41,6 +42,7 @@
case NTFS: cout << "NTFS"; break;
case HFSPLUS: cout << "HFSPLUS"; break;
case SWAP: cout << "SWAP"; break;
+ case NFS: cout << "NFS"; break;
case FSNONE: cout << "NONE"; break;
}
cout << '\n';
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/fstab1.cc new/yast2-storage-2.16.0/libstorage/testsuite/fstab1.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/fstab1.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/fstab1.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include <iostream>
#include <iterator>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/lvm_create.cc new/yast2-storage-2.16.0/libstorage/testsuite/lvm_create.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/lvm_create.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/lvm_create.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,3 +1,5 @@
+
+#include
#include <iostream>
#include <iterator>
#include <sstream>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/lvm_extend.cc new/yast2-storage-2.16.0/libstorage/testsuite/lvm_extend.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/lvm_extend.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/lvm_extend.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,3 +1,5 @@
+
+#include
#include <iostream>
#include <iterator>
#include <sstream>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/md_create.cc new/yast2-storage-2.16.0/libstorage/testsuite/md_create.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/md_create.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/md_create.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,3 +1,5 @@
+
+#include
#include <iostream>
#include <iterator>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/partition1.cc new/yast2-storage-2.16.0/libstorage/testsuite/partition1.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/partition1.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/partition1.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include <iostream>
#include <iterator>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite/uuid1.cc new/yast2-storage-2.16.0/libstorage/testsuite/uuid1.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite/uuid1.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite/uuid1.cc 2007-10-02 12:09:19.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include <iostream>
#include <fstream>
#include <iterator>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite-real/lvmcreate1.cc new/yast2-storage-2.16.0/libstorage/testsuite-real/lvmcreate1.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite-real/lvmcreate1.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite-real/lvmcreate1.cc 2007-10-02 12:10:49.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include <iostream>
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite-real/lvmcreate2.cc new/yast2-storage-2.16.0/libstorage/testsuite-real/lvmcreate2.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite-real/lvmcreate2.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite-real/lvmcreate2.cc 2007-10-02 12:10:36.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include <iostream>
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite-real/lvmextend1.cc new/yast2-storage-2.16.0/libstorage/testsuite-real/lvmextend1.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite-real/lvmextend1.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite-real/lvmextend1.cc 2007-10-02 12:10:26.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include <iostream>
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/libstorage/testsuite-real/lvmextend2.cc new/yast2-storage-2.16.0/libstorage/testsuite-real/lvmextend2.cc
--- old/yast2-storage-2.15.27/libstorage/testsuite-real/lvmextend2.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.0/libstorage/testsuite-real/lvmextend2.cc 2007-10-02 12:10:13.000000000 +0200
@@ -1,4 +1,5 @@
+#include
#include <iostream>
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/missing new/yast2-storage-2.16.0/missing
--- old/yast2-storage-2.15.27/missing 2007-08-28 15:51:28.000000000 +0200
+++ new/yast2-storage-2.16.0/missing 2007-09-26 17:35:05.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/pluglib-bindings.ami new/yast2-storage-2.16.0/pluglib-bindings.ami
--- old/yast2-storage-2.15.27/pluglib-bindings.ami 2007-08-28 15:50:47.000000000 +0200
+++ new/yast2-storage-2.16.0/pluglib-bindings.ami 2007-09-26 17:34:51.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: pluglib-bindings.ami 35906 2007-02-06 15:26:47Z mvidner $
+# $Id: pluglib-bindings.ami 27327 2006-01-25 14:12:13Z mvidner $
# Wraps a pluglib for use by YaST. Done by using Swig for Perl, adding
# type information. Compiles, installs.
@@ -43,9 +43,7 @@
if test -d $(PLUGLIB_MODULE); then \
rm -f $(PLUGLIB_MODULE)/*.pm; \
fi
- sabcmd $(PLGB_TYPEINFO_XSL) $< > $*.tpi
- perl $(PLGB_TYPEINFO_FILTER) < $*.tpi
- rm $*.tpi
+ sabcmd $(PLGB_TYPEINFO_XSL) $< | perl $(PLGB_TYPEINFO_FILTER)
# Install the Perl modules
PLGB_PMdir = $(moduledir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/README new/yast2-storage-2.16.0/README
--- old/yast2-storage-2.15.27/README 2007-09-24 16:00:04.000000000 +0200
+++ new/yast2-storage-2.16.0/README 2007-10-02 19:23:55.000000000 +0200
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYRIGHT.english for license terms
+See the file COPYING for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.16.0/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.15.27/storage/src/include/custom_part_lib.ycp 2007-09-20 15:52:49.000000000 +0200
+++ new/yast2-storage-2.16.0/storage/src/include/custom_part_lib.ycp 2007-10-02 10:07:17.000000000 +0200
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 40987 2007-09-20 13:52:49Z fehr $
+ $Id: custom_part_lib.ycp 41147 2007-09-27 14:22:26Z fehr $
*
*/
@@ -142,6 +142,10 @@
});
y2milestone( "findExistingFstab tmp %1", tmp );
}
+ integer s = size(tmp);
+ tmp = filter( map p, tmp, ``(Storage::CanEdit(p,false)));
+ if( s!=size(tmp) )
+ y2milestone( "findExistingFstab tmp %1", tmp );
if( size(vardev)>0 )
Storage::Umount( vardev );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.27/VERSION new/yast2-storage-2.16.0/VERSION
--- old/yast2-storage-2.15.27/VERSION 2007-09-24 15:51:49.000000000 +0200
+++ new/yast2-storage-2.16.0/VERSION 2007-09-26 17:34:38.000000000 +0200
@@ -1 +1 @@
-2.15.27
+2.16.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org