Hello community,
here is the log from the commit of package yast2-storage
checked in at Sat Aug 16 04:14:45 CEST 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-08-09 11:14:34.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2008-08-15 18:19:45.228094000 +0200
@@ -1,0 +2,18 @@
+Thu Aug 14 17:43:43 CEST 2008 - kmachalkova@suse.cz
+
+- First steps to integrate nfs-client into partitioner (making it
+ one of its views) (FaTE#303326)
+
+-------------------------------------------------------------------
+Wed Aug 13 15:16:27 CEST 2008 - aschnell@suse.de
+
+- display fibre channel information (fate #304333)
+- version 2.17.17
+
+-------------------------------------------------------------------
+Tue Aug 12 19:32:35 CEST 2008 - aschnell@suse.de
+
+- improved logging during disk detection
+- version 2.17.16
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.17.15.tar.bz2
New:
----
yast2-storage-2.17.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.Eg1224/_old 2008-08-16 04:13:55.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg1224/_new 2008-08-16 04:13:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.17.15)
+# spec file for package yast2-storage (Version 2.17.17)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,16 +19,16 @@
Name: yast2-storage
-Version: 2.17.15
+Version: 2.17.17
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.17.15.tar.bz2
+Source0: yast2-storage-2.17.17.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup
-Requires: yast2-core >= 2.17.1
+Requires: yast2-core >= 2.17.8
Requires: yast2 >= 2.17.3
Requires: yast2-libyui >= 2.17.5
%ifarch s390 s390x
@@ -57,7 +57,7 @@
Arvin Schnell
%prep
-%setup -n yast2-storage-2.17.15
+%setup -n yast2-storage-2.17.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -179,6 +179,15 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Thu Aug 14 2008 kmachalkova@suse.cz
+- First steps to integrate nfs-client into partitioner (making it
+ one of its views) (FaTE#303326)
+* Wed Aug 13 2008 aschnell@suse.de
+- display fibre channel information (fate #304333)
+- version 2.17.17
+* Tue Aug 12 2008 aschnell@suse.de
+- improved logging during disk detection
+- version 2.17.16
* Sat Aug 09 2008 aschnell@suse.de
- added usedByDevice in StorageInterface.h
- version 2.17.15
++++++ yast2-storage-2.17.15.tar.bz2 -> yast2-storage-2.17.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/configure new/yast2-storage-2.17.17/configure
--- old/yast2-storage-2.17.15/configure 2008-08-09 11:01:34.000000000 +0200
+++ new/yast2-storage-2.17.17/configure 2008-08-15 09:47:56.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.15.
+# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.17.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.17.15'
-PACKAGE_STRING='yast2-storage 2.17.15'
+PACKAGE_VERSION='2.17.17'
+PACKAGE_STRING='yast2-storage 2.17.17'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1449,7 +1449,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-storage 2.17.15 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.17.17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.17.15:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.17.17:";;
esac
cat <<\_ACEOF
@@ -1630,7 +1630,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.17.15
+yast2-storage configure 2.17.17
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1644,7 +1644,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-storage $as_me 2.17.15, which was
+It was created by yast2-storage $as_me 2.17.17, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2465,7 +2465,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.17.15'
+ VERSION='2.17.17'
cat >>confdefs.h <<_ACEOF
@@ -2693,7 +2693,7 @@
-VERSION="2.17.15"
+VERSION="2.17.17"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -21746,7 +21746,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.17.15, which was
+This file was extended by yast2-storage $as_me 2.17.17, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21799,7 +21799,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.17.15
+yast2-storage config.status 2.17.17
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/configure.in new/yast2-storage-2.17.17/configure.in
--- old/yast2-storage-2.17.15/configure.in 2008-08-09 11:01:19.000000000 +0200
+++ new/yast2-storage-2.17.17/configure.in 2008-08-15 09:47:42.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.17.15, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.17.17, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.15"
+VERSION="2.17.17"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/data/sysconfig.storage new/yast2-storage-2.17.17/data/sysconfig.storage
--- old/yast2-storage-2.17.15/data/sysconfig.storage 2008-08-08 11:32:02.000000000 +0200
+++ new/yast2-storage-2.17.17/data/sysconfig.storage 2008-08-13 15:35:57.000000000 +0200
@@ -23,7 +23,7 @@
## Type: string
# List of hidden fields in expert-partitioner.
# Allowed values are: label uuid mount_by used_by bios_id start_cyl
-# end_cyl num_cyl cyl_size fc_wwpn fc_port_id
+# end_cyl num_cyl cyl_size fc_wwpn fc_fcp_lun fc_port_id
#
# Separate individual values by single space
-HIDDEN_FIELDS=""
+HIDDEN_FIELDS="fc_wwpn fc_fcp_lun fc_port_id"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/AppUtil.cc new/yast2-storage-2.17.17/libstorage/src/AppUtil.cc
--- old/yast2-storage-2.17.15/libstorage/src/AppUtil.cc 2008-08-06 12:18:45.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/AppUtil.cc 2008-08-11 17:45:23.000000000 +0200
@@ -135,7 +135,7 @@
S_ISREG(Stat_ri.st_mode));
}
-string extractNthWord(int Num_iv, string Line_Cv, bool GetRest_bi)
+string extractNthWord(int Num_iv, const string& Line_Cv, bool GetRest_bi)
{
string::size_type pos;
int I_ii=0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/AppUtil.h new/yast2-storage-2.17.17/libstorage/src/AppUtil.h
--- old/yast2-storage-2.17.15/libstorage/src/AppUtil.h 2008-08-06 12:34:18.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/AppUtil.h 2008-08-11 17:41:56.000000000 +0200
@@ -8,6 +8,7 @@
#include <cstdio>
#include <fstream>
#include <sstream>
+#include <locale>
#include <string>
#include <list>
#include <map>
@@ -27,7 +28,7 @@
bool checkDir(string Path_Cv);
string dupDash(const string& s);
-string extractNthWord(int Num_iv, string Line_Cv, bool GetRest_bi = false);
+string extractNthWord(int Num_iv, const string& Line_Cv, bool GetRest_bi = false);
std::list<string> splitString( const string& s, const string& delChars=" \t\n",
bool multipleDelim=true, bool skipEmpty=true,
const string& quotes="" );
@@ -45,6 +46,14 @@
bool isNfsDev( const string& dev );
unsigned getMajorDevices( const string& driver );
+
+template<class StreamType>
+void classic(StreamType& stream)
+{
+ stream.imbue(std::locale::classic());
+}
+
+
void createLogger(const string& component, const string& name,
const string& logpath, const string& logfile);
@@ -72,17 +81,21 @@
#define y2log_op(level, file, line, function, op) \
do { \
std::ostringstream __buf; \
+ storage::classic(__buf); \
__buf << op; \
- logMsg(level, file, line, function, __buf.str()); \
+ storage::logMsg(level, file, line, function, __buf.str()); \
} while (0)
+
string sformat(const char* format, ...);
+
string byteToHumanString(unsigned long long size, bool classic, int precision,
bool omit_zeroes);
bool humanStringToByte(const string& str, bool classic, unsigned long long& size);
+
inline const char* _(const char* msgid)
{
return dgettext("storage", msgid);
@@ -93,6 +106,7 @@
return dngettext("storage", msgid, msgid_plural, n);
}
+
extern const string app_ws;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/AsciiFile.cc new/yast2-storage-2.17.17/libstorage/src/AsciiFile.cc
--- old/yast2-storage-2.17.15/libstorage/src/AsciiFile.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/AsciiFile.cc 2008-08-11 12:17:13.000000000 +0200
@@ -75,6 +75,7 @@
bool AsciiFile::appendFile( const string& Name_Cv, vector<string>& Lines_Cr )
{
ifstream File_Ci( Name_Cv.c_str() );
+ classic(File_Ci);
string Line_Ci;
bool Ret_bi = File_Ci.good();
@@ -103,6 +104,7 @@
bool AsciiFile::insertFile( const string& Name_Cv, unsigned int BeforeLine_iv )
{
ifstream File_Ci( Name_Cv.c_str() );
+ classic(File_Ci);
string Line_Ci;
vector<string> New_Ci;
@@ -178,6 +180,7 @@
BackupCreated_b = true;
}
ofstream File_Ci( Name_C.c_str() );
+ classic(File_Ci);
unsigned int Idx_ii = 0;
DBG( App_pC->Dbg() << "Writing File:\"" << Name_C << "\"\n"; )
@@ -207,6 +210,7 @@
bool AsciiFile::saveToFile( const string& Name_Cv )
{
ofstream File_Ci( Name_Cv.c_str() );
+ classic(File_Ci);
unsigned int Idx_ii = 0;
DBG( App_pC->Dbg() << "SaveToFile File:\"" << Name_Cv << "\"\n"; )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/Container.cc new/yast2-storage-2.17.17/libstorage/src/Container.cc
--- old/yast2-storage-2.17.15/libstorage/src/Container.cc 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/Container.cc 2008-08-14 17:21:00.000000000 +0200
@@ -361,6 +361,7 @@
if( uby!=c.uby )
{
std::ostringstream b;
+ classic(b);
b << uby << "-->" << string(c.uby);
ret += b.str();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/Dasd.cc new/yast2-storage-2.17.17/libstorage/src/Dasd.cc
--- old/yast2-storage-2.17.15/libstorage/src/Dasd.cc 2008-08-08 14:49:04.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/Dasd.cc 2008-08-11 12:19:21.000000000 +0200
@@ -131,6 +131,7 @@
y2debug( "Line: %s", Line.c_str() );
std::istringstream Data( Line );
+ classic(Data);
nr=0;
StartM = EndM = 0;
@@ -368,6 +369,7 @@
}
string inpname = getStorage()->tmpDir()+"/fdasd_inp";
ofstream inpfile( inpname.c_str() );
+ classic(inpfile);
PartPair p = partPair( notDeleted );
PartIter i = p.begin();
while( i!=p.end() )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/Disk.cc new/yast2-storage-2.17.17/libstorage/src/Disk.cc
--- old/yast2-storage-2.17.15/libstorage/src/Disk.cc 2008-08-07 22:48:14.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/Disk.cc 2008-08-11 12:10:05.000000000 +0200
@@ -300,6 +300,7 @@
if( access( SysfsFile.c_str(), R_OK )==0 )
{
ifstream File( SysfsFile.c_str() );
+ classic(File);
File >> range;
if( range<=1 ) ret = false;
}
@@ -311,6 +312,7 @@
if( access( SysfsFile.c_str(), R_OK )==0 )
{
ifstream File( SysfsFile.c_str() );
+ classic(File);
char c;
File >> mjr;
File >> c;
@@ -467,6 +469,7 @@
{
string fname( Dir + "/disk_" + logfile_name + ".tmp" );
ofstream file( fname.c_str() );
+ classic(file);
file << "Device: " << dev << endl;
if( !udev_path.empty() )
file << "UdevPath: " << udev_path << endl;
@@ -626,6 +629,7 @@
y2debug( "Line: %s", Line.c_str() );
std::istringstream Data( Line );
+ classic(Data);
nr=0;
StartM = EndM = 0;
@@ -639,7 +643,7 @@
{
Data >> nr >> StartM >> skip >> EndM >> skip >> skip;
}
- if( !Data.good() )
+ if (Data.fail())
{
y2mil( "invalid line:" << Line );
nr = 0;
@@ -1866,6 +1870,7 @@
removePresentPartitions();
system_stderr.erase();
std::ostringstream cmd_line;
+ classic(cmd_line);
cmd_line << PARTEDCMD << quote(device()) << " mklabel " << label;
if( execCheckFailed( cmd_line.str() ) )
{
@@ -1961,6 +1966,7 @@
}
system_stderr.erase();
std::ostringstream cmd_line;
+ classic(cmd_line);
cmd_line << PARTEDCMD << quote(device()) << " set " << p->nr() << " ";
string start_cmd = cmd_line.str();
if( ret==0 )
@@ -2042,6 +2048,7 @@
{
ProcPart ppart;
std::ostringstream cmd_line;
+ classic(cmd_line);
cmd_line << PARTEDCMD << quote(device()) << " unit cyl print | grep -w \"^[ \t]*\"" << p->nr();
SystemCmd cmd( cmd_line.str() );
unsigned nr, id;
@@ -2089,12 +2096,14 @@
else
{
std::ostringstream cmd_line;
+ classic(cmd_line);
cmd_line << PARTEDCMD << quote(device()) << " unit s print | grep -w \"^[ \t]*\"" << p->nr();
SystemCmd cmd( cmd_line.str() );
if( cmd.numLines()>0 )
{
string dummy, s1, s2;
std::istringstream data( *cmd.getLine(0) );
+ classic(data);
data >> dummy >> s1 >> s2;
y2milestone( "dummy:\"%s\" s1:\"%s\" s2:\"%s\"", dummy.c_str(),
s1.c_str(), s2.c_str() );
@@ -2155,6 +2164,7 @@
enlargeGpt();
}
std::ostringstream cmd_line;
+ classic(cmd_line);
if( ret==0 )
{
cmd_line << PARTEDCMD << quote(device()) << " unit cyl mkpart ";
@@ -2340,6 +2350,7 @@
if( ret==0 && !p->created() )
{
std::ostringstream cmd_line;
+ classic(cmd_line);
cmd_line << PARTEDCMD << quote(device()) << " rm " << p->OrigNr();
if( execCheckFailed( cmd_line.str() ) )
{
@@ -2492,6 +2503,7 @@
y2milestone( "doResize container %s name %s", name().c_str(),
p->name().c_str() );
std::ostringstream cmd_line;
+ classic(cmd_line);
unsigned long long start_sect, end_sect;
getPartedSectors( p, start_sect, end_sect );
end_sect = start_sect + p->sizeK()*2 - 1;
@@ -2717,7 +2729,7 @@
}
}
else
- y2mil( "" << log );
+ y2mil(log);
}
bool Disk::equalContent( const Container& rhs ) const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/Dm.cc new/yast2-storage-2.17.17/libstorage/src/Dm.cc
--- old/yast2-storage-2.17.15/libstorage/src/Dm.cc 2008-08-08 13:56:00.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/Dm.cc 2008-08-12 11:16:19.000000000 +0200
@@ -189,6 +189,7 @@
if( pos != string::npos )
pair[pos] = ' ';
istringstream i( pair );
+ classic(i);
i >> mj >> mi;
list<string> ls = splitString(pair);
if( cont->majorNr()>0 && mj==cont->majorNr() && mi==cont->minorNr())
@@ -587,6 +588,7 @@
if( pe_map!=rhs.pe_map )
{
std::ostringstream b;
+ classic(b);
b << " pe_map:" << pe_map << "-->" << rhs.pe_map;
ret += b.str();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/DmCo.cc new/yast2-storage-2.17.17/libstorage/src/DmCo.cc
--- old/yast2-storage-2.17.15/libstorage/src/DmCo.cc 2008-08-08 22:31:53.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/DmCo.cc 2008-08-13 15:36:25.000000000 +0200
@@ -343,7 +343,7 @@
void DmCo::logDifference( const Container& d ) const
{
- y2mil( "" << getDiffString( d ));
+ y2mil(getDiffString(d));
const DmCo * p = dynamic_cast(&d);
if( p != NULL )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/EtcFstab.cc new/yast2-storage-2.17.17/libstorage/src/EtcFstab.cc
--- old/yast2-storage-2.17.15/libstorage/src/EtcFstab.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/EtcFstab.cc 2008-08-11 12:15:24.000000000 +0200
@@ -30,6 +30,7 @@
{
string file = prefix+"/fstab";
ifstream mounts( file.c_str() );
+ classic(mounts);
string line;
unsigned lineno = 0;
getline( mounts, line );
@@ -654,6 +655,7 @@
{
y2mil( "name:" << fname );
ifstream file( fname.c_str() );
+ classic(file);
string line;
int count = 1;
getline( file, line );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/LoopCo.cc new/yast2-storage-2.17.17/libstorage/src/LoopCo.cc
--- old/yast2-storage-2.17.15/libstorage/src/LoopCo.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/LoopCo.cc 2008-08-09 13:58:53.000000000 +0200
@@ -348,7 +348,7 @@
void LoopCo::logDifference( const Container& d ) const
{
- y2mil( "" << getDiffString( d ));
+ y2mil(getDiffString(d));
const LoopCo * p = dynamic_cast(&d);
if( p != NULL )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/LvmVg.cc new/yast2-storage-2.17.17/libstorage/src/LvmVg.cc
--- old/yast2-storage-2.17.15/libstorage/src/LvmVg.cc 2008-08-08 11:41:09.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/LvmVg.cc 2008-08-13 16:35:14.000000000 +0200
@@ -1488,7 +1488,7 @@
}
}
else
- y2mil( "" << Container::getDiffString(d) );
+ y2mil(Container::getDiffString(d));
}
bool LvmVg::equalContent( const Container& rhs ) const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/Md.cc new/yast2-storage-2.17.17/libstorage/src/Md.cc
--- old/yast2-storage-2.17.15/libstorage/src/Md.cc 2008-08-06 10:50:17.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/Md.cc 2008-08-11 12:15:43.000000000 +0200
@@ -641,12 +641,14 @@
if( devs!=rhs.devs )
{
std::ostringstream b;
+ classic(b);
b << " Devices:" << devs << "-->" << rhs.devs;
log += b.str();
}
if( spare!=rhs.spare )
{
std::ostringstream b;
+ classic(b);
b << " Spares:" << spare << "-->" << rhs.spare;
log += b.str();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/MdCo.cc new/yast2-storage-2.17.17/libstorage/src/MdCo.cc
--- old/yast2-storage-2.17.15/libstorage/src/MdCo.cc 2008-08-08 22:31:53.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/MdCo.cc 2008-08-11 12:16:09.000000000 +0200
@@ -87,6 +87,7 @@
y2milestone( "begin" );
string line;
std::ifstream file( "/proc/mdstat" );
+ classic(file);
unsigned dummy;
getline( file, line );
while( file.good() )
@@ -158,6 +159,7 @@
y2milestone( "num:%u", num );
string line;
std::ifstream file( "/proc/mdstat" );
+ classic(file);
string md = "md" + decString(num);
getline( file, line );
while( file.good() )
@@ -719,7 +721,7 @@
void MdCo::logDifference( const Container& d ) const
{
- y2mil( "" << getDiffString( d ));
+ y2mil(getDiffString(d));
const MdCo * p = dynamic_cast(&d);
if( p != NULL )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/NfsCo.cc new/yast2-storage-2.17.17/libstorage/src/NfsCo.cc
--- old/yast2-storage-2.17.15/libstorage/src/NfsCo.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/NfsCo.cc 2008-08-09 13:58:53.000000000 +0200
@@ -221,7 +221,7 @@
void NfsCo::logDifference( const Container& d ) const
{
- y2mil( "" << Container::getDiffString( d ));
+ y2mil(Container::getDiffString(d));
const NfsCo* p = dynamic_cast(&d);
if( p != NULL )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/Partition.cc new/yast2-storage-2.17.17/libstorage/src/Partition.cc
--- old/yast2-storage-2.17.15/libstorage/src/Partition.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/Partition.cc 2008-08-11 12:18:32.000000000 +0200
@@ -41,6 +41,7 @@
{
string ts, rs;
istringstream i( Data );
+ classic(i);
i >> num >> dev >> size_k >> mjr >> mnr >> reg >>
hex >> idt >> dec >> ts >> rs;
orig_size_k = size_k;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/ProcMounts.cc new/yast2-storage-2.17.17/libstorage/src/ProcMounts.cc
--- old/yast2-storage-2.17.15/libstorage/src/ProcMounts.cc 2008-08-07 22:39:25.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/ProcMounts.cc 2008-08-11 12:10:25.000000000 +0200
@@ -22,6 +22,7 @@
getFindRevMap( "/dev/disk/by-label", by_label );
getFindRevMap( "/dev/disk/by-uuid", by_uuid );
ifstream mounts( "/proc/mounts" );
+ classic(mounts);
string line;
getline( mounts, line );
SystemCmd mt(MOUNTBIN);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/Storage.cc new/yast2-storage-2.17.17/libstorage/src/Storage.cc
--- old/yast2-storage-2.17.15/libstorage/src/Storage.cc 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/Storage.cc 2008-08-14 17:21:00.000000000 +0200
@@ -103,6 +103,7 @@
defaultMountBy = MOUNTBY_ID;
detectMounted = true;
ifstream File( "/proc/version" );
+ classic(File);
string line;
getline( File, line );
File.close();
@@ -213,6 +214,7 @@
void Storage::dumpObjectList()
{
ostringstream buf;
+ classic(buf);
printInfo(buf);
std::list<string> l = splitString( buf.str(), "\n" );
y2mil("DETECTED OBJECTS");
@@ -724,12 +726,14 @@
if( access( SysfsFile.c_str(), R_OK )==0 )
{
ifstream File( SysfsFile.c_str() );
+ classic(File);
File >> Range;
}
SysfsFile = SysfsDir+"/size";
if( access( SysfsFile.c_str(), R_OK )==0 )
{
ifstream File( SysfsFile.c_str() );
+ classic(File);
File >> Size;
}
string dn = Entry->d_name;
@@ -856,6 +860,7 @@
{
string fname( Dir + "/volume_info.tmp" );
ofstream file( fname.c_str() );
+ classic(file);
for( VolIterator i=vBegin(); i!=vEnd(); ++i )
{
if( i->getFs()!=FSUNKNOWN )
@@ -986,7 +991,7 @@
{
return new Storage (ronly, testmode, autodetect);
}
- catch (LockException& e)
+ catch (const LockException& e)
{
locker_pid = e.GetLockerPid();
return NULL;
@@ -3483,6 +3488,7 @@
{
co.sort( (stage==DECREASE)?sort_cont_up:sort_cont_down );
std::ostringstream b;
+ classic(b);
if( stage==DECREASE )
{
vl.reverse();
@@ -4390,6 +4396,7 @@
Storage::logCo( Container* c ) const
{
std::ostringstream b;
+ classic(b);
c->print( b );
y2mil( "log co:" << b.str() );
for( Container::ConstPlainIterator i=c->begin(); i!=c->end(); ++i )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/StorageInterface.h new/yast2-storage-2.17.17/libstorage/src/StorageInterface.h
--- old/yast2-storage-2.17.15/libstorage/src/StorageInterface.h 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/StorageInterface.h 2008-08-14 17:21:00.000000000 +0200
@@ -171,7 +171,7 @@
string device;
string name;
UsedByType usedByType;
- string usedByName;
+ string usedByName; // deprecated
string usedByDevice;
bool readonly;
};
@@ -245,7 +245,7 @@
string mount;
MountByType mount_by;
UsedByType usedByType;
- string usedByName;
+ string usedByName; // deprecated
string usedByDevice;
string fstab_options;
string uuid;
@@ -1593,8 +1593,8 @@
/**
* Compute the size of a raid device.
*
- * The size compute may not be accurate. It should not be used for
- * further computations.
+ * The size compute may not be accurate. It must not be used for
+ * further computations. Do not used in new code.
*
* @param md_type raid type of the software raid
* @param devices list with physical devices for the software raid
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/StorageTmpl.h new/yast2-storage-2.17.17/libstorage/src/StorageTmpl.h
--- old/yast2-storage-2.17.15/libstorage/src/StorageTmpl.h 2008-08-06 12:34:18.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/StorageTmpl.h 2008-08-11 12:05:27.000000000 +0200
@@ -124,24 +124,27 @@
template<class Num> string decString(Num number)
- {
+{
std::ostringstream num_str;
+ classic(num_str);
num_str << number;
- return( num_str.str() );
- }
+ return num_str.str();
+}
template<class Num> string hexString(Num number)
- {
+{
std::ostringstream num_str;
+ classic(num_str);
num_str << std::hex << number;
- return( num_str.str() );
- }
+ return num_str.str();
+}
-template<class Value> void operator>>( const string& d, Value& v)
- {
- std::istringstream Data( d );
+template<class Value> void operator>>(const string& d, Value& v)
+{
+ std::istringstream Data(d);
+ classic(Data);
Data >> v;
- }
+}
template<class Value> std::ostream& operator<<( std::ostream& s, const std::list<Value>& l )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/libstorage/src/Volume.cc new/yast2-storage-2.17.17/libstorage/src/Volume.cc
--- old/yast2-storage-2.17.15/libstorage/src/Volume.cc 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/libstorage/src/Volume.cc 2008-08-12 09:42:12.000000000 +0200
@@ -61,6 +61,7 @@
void Volume::setNameDev()
{
std::ostringstream Buf_Ci;
+ classic(Buf_Ci);
if( numeric )
Buf_Ci << cont->device() << (Disk::needP(cont->device())?"p":"") << num;
else
@@ -240,6 +241,7 @@
if( found )
{
std::ostringstream b;
+ classic(b);
b << "line[" << device() << "]=";
b << "noauto:" << entry.noauto;
if( mp.empty() )
@@ -271,6 +273,7 @@
{
char buf[10];
ifstream file( dev.c_str() );
+ classic(file);
file.read( buf, sizeof(buf) );
if( file.good() && strncmp( buf, "LUKS", 4 )==0 )
setEncryption( ENC_LUKS );
@@ -329,6 +332,7 @@
{
list<string> l = splitString( *loopData.getLine( 0, true ));
std::ostringstream b;
+ classic(b);
b << "line[" << device() << "]=" << l;
y2mil(b.str());
if( !l.empty() )
@@ -382,6 +386,7 @@
list<string> l = splitString( *blkidData.getLine( 0, true ), " \t\n",
true, true, "\"" );
std::ostringstream b;
+ classic(b);
b << "line[" << device() << "]=" << l;
y2mil(b.str());
if( !l.empty() )
@@ -698,6 +703,7 @@
if( c.execute( cmd ) != 0 )
ret = VOLUME_FORMAT_DD_FAILED;
ofstream s( mountDevice().c_str() );
+ classic(s);
ofstream::pos_type p = s.seekp( 0, ios_base::end ).tellp();
y2mil( "good:" << s.good() << " pos_type:" << p );
const unsigned count=200;
@@ -907,6 +913,7 @@
if( access( path.c_str(), R_OK )==0 )
{
ofstream file( path.c_str() );
+ classic(file);
if( file.good() )
{
y2mil( "writing \"add\" to " << path );
@@ -1201,7 +1208,7 @@
switch( fs )
{
case SWAP:
- cmd = "mkswap " + quote(mountDevice());
+ cmd = "/sbin/mkswap " + quote(mountDevice());
c.execute( cmd );
if( c.retcode()!=0 )
ret = VOLUME_RESIZE_FAILED;
@@ -1655,6 +1662,7 @@
do
{
ofstream pwdfile( fname.c_str() );
+ classic(pwdfile);
pwdfile << crypt_pwd;
pwdfile.close();
encryption = orig_encryption = try_order[pos];
@@ -1765,6 +1773,7 @@
{
fname = cont->getStorage()->tmpDir()+"/pwdf";
ofstream pwdfile( fname.c_str() );
+ classic(pwdfile);
pwdfile << crypt_pwd << endl;
pwdfile.close();
}
@@ -1870,6 +1879,7 @@
{
string fname = cont->getStorage()->tmpDir()+"/pwdf";
ofstream pwdfile( fname.c_str() );
+ classic(pwdfile);
pwdfile << crypt_pwd;
pwdfile.close();
SystemCmd cmd;
@@ -1883,7 +1893,7 @@
if( cmd.retcode()!=0 )
ret = VOLUME_CRYPTFORMAT_FAILED;
if( ret==0 && mp=="swap" )
- cmd.execute("mkswap " + quote(dmcrypt_dev));
+ cmd.execute("/sbin/mkswap " + quote(dmcrypt_dev));
}
}
if( ret==0 && (!isTmpCryptMp(mp)||!crypt_pwd.empty()) )
@@ -2035,7 +2045,7 @@
}
break;
case SWAP:
- cmd = "/sbin/mkswap -L " + quote(label) + "\" " + quote(mountDevice());
+ cmd = "/sbin/mkswap -L " + quote(label) + " " + quote(mountDevice());
break;
default:
ret = VOLUME_MKLABEL_FS_UNABLE;
@@ -2957,6 +2967,7 @@
if( uby!=rhs.uby )
{
std::ostringstream b;
+ classic(b);
b << uby << "-->" << string(rhs.uby);
ret += b.str();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.17.17/storage/src/include/ep-dialogs.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-dialogs.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-dialogs.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -8,18 +8,6 @@
textdomain "storage";
- // TODO: see fate #304971
- boolean YesNo(string text)
- {
- return Popup::YesNo(String::WrapAt(text, 50, ""));
- }
-
- void Error(string text)
- {
- Popup::Error(String::WrapAt(text, 50, ""));
- }
-
-
symbol MiniWorkflowStepFormatMount(map &orig_data)
{
map data = orig_data;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-dm-lib.ycp new/yast2-storage-2.17.17/storage/src/include/ep-dm-lib.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-dm-lib.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-dm-lib.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -12,7 +12,7 @@
{
if (device == nil)
{
- Error(_("No DM device selected."));
+ Popup::Error(_("No DM device selected."));
return;
}
@@ -21,7 +21,7 @@
if (data["used_by"]:"" != "")
{
- Error(sformat(_("The DM %1 is in use. It cannot be
+ Popup::Error(sformat(_("The DM %1 is in use. It cannot be
edited. To edit %1, make sure it is not used."), device));
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-dm.ycp new/yast2-storage-2.17.17/storage/src/include/ep-dm.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-dm.ycp 2008-08-08 22:31:53.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-dm.ycp 2008-08-15 18:13:06.000000000 +0200
@@ -57,8 +57,6 @@
UI::ReplaceWidget(`tab_panel,
Greasemonkey::Transform(
`VBox(
- `IconAndHeading(sformat(_("DM Device: %1"), dm_device), dm_icon),
- `HStretch(),
StorageFields::Overview(fields, target_map, dm_device),
`HBox(
`PushButton(`id(`edit), _("Edit...")),
@@ -129,7 +127,7 @@
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
`VBox(
- `IconAndHeading(sformat(_("Dm Device: %1"), device), dm_icon),
+ `IconAndHeading(sformat(_("DM Device: %1"), device), dm_icon),
`DumbTab(`id(`tab), [
`item(`id(`overview), _("&Overview")),
`item(`id(`devices), _("&Used Devices"))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-hd-dialogs.ycp new/yast2-storage-2.17.17/storage/src/include/ep-hd-dialogs.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-hd-dialogs.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-hd-dialogs.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -132,14 +132,16 @@
string tmp = (string) UI::QueryWidget(`id(`size_input), `Value);
if (!Storage::HumanStringToKByte(tmp, size_k))
{
- Error(_("The size entered is invalid. Enter a value like \"500MB\" or \"1GB\"."));
+ Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."),
+ Storage::KByteToHumanString(500*1024),
+ Storage::KByteToHumanString(1024*1024)));
widget = `again;
}
else if (size_k < min_size_k || size_k > max_size_k)
{
- Error(sformat(_("The size entered is invalid. Enter a size beteen %1 and %2."),
- Storage::KByteToHumanString(min_size_k),
- Storage::KByteToHumanString(max_size_k)));
+ Popup::Error(sformat(_("The size entered is invalid. Enter a size beteen %1 and %2."),
+ Storage::KByteToHumanString(min_size_k),
+ Storage::KByteToHumanString(max_size_k)));
widget = `again;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-hd-lib.ycp new/yast2-storage-2.17.17/storage/src/include/ep-hd-lib.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-hd-lib.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-hd-lib.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -12,7 +12,7 @@
{
if (disk_device == nil)
{
- Error(_("No hard disk selected."));
+ Popup::Error(_("No hard disk selected."));
return;
}
@@ -54,7 +54,7 @@
return;
}
- if (YesNo(sformat(_("Really create new partition table on %1? This will delete all data
+ if (Popup::YesNo(sformat(_("Really create new partition table on %1? This will delete all data
on %1 and all RAIDs and Volume Groups using partitions on %1."), disk_device)))
{
Storage::CreatePartitionTable(disk_device, label);
@@ -109,7 +109,7 @@
{
if (disk_device == nil)
{
- Error(_("No hard disk selected."));
+ Popup::Error(_("No hard disk selected."));
return;
}
@@ -157,7 +157,7 @@
{
if (device == nil)
{
- Error(_("No partition selected."));
+ Popup::Error(_("No partition selected."));
return;
}
@@ -166,7 +166,7 @@
if (data["used_by"]:"" != "")
{
- Error(sformat(_("The partition %1 is in use. It cannot be
+ Popup::Error(sformat(_("The partition %1 is in use. It cannot be
edited. To edit %1, make sure it is not used."), device));
return;
}
@@ -188,7 +188,7 @@
{
if (device == nil)
{
- Error(_("No partition selected."));
+ Popup::Error(_("No partition selected."));
return;
}
@@ -204,7 +204,7 @@
if (data["used_by"]:"" != "")
{
- Error(sformat(_("The partition %1 is in use. It cannot be
+ Popup::Error(sformat(_("The partition %1 is in use. It cannot be
resized. To resize %1, make sure it is not used."), device));
return;
}
@@ -218,7 +218,7 @@
{
if (device == nil)
{
- Error(_("No partition selected."));
+ Popup::Error(_("No partition selected."));
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-hd.ycp new/yast2-storage-2.17.17/storage/src/include/ep-hd.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-hd.ycp 2008-08-07 10:48:48.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-hd.ycp 2008-08-15 18:10:56.000000000 +0200
@@ -200,7 +200,8 @@
list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `udev_path,
`udev_id, `used_by, `heading_hd, `vendor,
`model, `num_cyl, `cyl_size, `bus, `bios_id,
- `disk_label ]);
+ `disk_label, `heading_fc, `fc_wwpn, `fc_port_id,
+ `fc_fcp_lun ]);
UI::ReplaceWidget(`tab_panel,
`VBox(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-loop-dialogs.ycp new/yast2-storage-2.17.17/storage/src/include/ep-loop-dialogs.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-loop-dialogs.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-loop-dialogs.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -100,13 +100,14 @@
string tmp = (string) UI::QueryWidget(`id(`size), `Value);
if (!Storage::HumanStringToKByte(tmp, size_k))
{
- Error(_("The size entered is invalid. Enter a value like \"500MB\" or \"1GB\"."));
+ Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."),
+ Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024)));
widget = `again;
}
else if (size_k < min_size_k)
{
- Error(sformat(_("The size entered is invalid. Enter a size of at least %1."),
- Storage::KByteToHumanString(min_size_k)));
+ Popup::Error(sformat(_("The size entered is invalid. Enter a size of at least %1."),
+ Storage::KByteToHumanString(min_size_k)));
widget = `again;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-loop-lib.ycp new/yast2-storage-2.17.17/storage/src/include/ep-loop-lib.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-loop-lib.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-loop-lib.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -44,7 +44,7 @@
{
if (device == nil)
{
- Error(_("No crypt file selected."));
+ Popup::Error(_("No crypt file selected."));
return;
}
@@ -53,7 +53,7 @@
if (data["used_by"]:"" != "")
{
- Error(sformat(_("The Crypt File %1 is in use. It cannot be
+ Popup::Error(sformat(_("The Crypt File %1 is in use. It cannot be
edited. To edit %1, make sure it is not used."), device));
return;
}
@@ -75,7 +75,7 @@
{
if (device == nil)
{
- Error(_("No crypt file selected."));
+ Popup::Error(_("No crypt file selected."));
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.17.17/storage/src/include/ep-lvm-dialogs.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-lvm-dialogs.ycp 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-lvm-dialogs.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -13,21 +13,21 @@
if (size(name) == 0)
{
// error popup text
- Error(_("Enter a name for the volume group."));
+ Popup::Error(_("Enter a name for the volume group."));
return false;
}
if (size(name) > 128)
{
// error popup text
- Error(_("The name for the volume group is longer than 128 characters."));
+ Popup::Error(_("The name for the volume group is longer than 128 characters."));
return false;
}
if (substring(name, 0, 1) == "-")
{
// error popup text
- Error(_("The name for the volume group must not start with a \"-\"."));
+ Popup::Error(_("The name for the volume group must not start with a \"-\"."));
return false;
}
@@ -36,7 +36,7 @@
if (findfirstnotof(name, allowed_chars) != nil)
{
// error popup text
- Error(_("The name for the volume group contains illegal characters. Allowed
+ Popup::Error(_("The name for the volume group contains illegal characters. Allowed
are alphanumeric characters, \".\", \"_\", \"-\" and \"+\"."));
return false;
}
@@ -50,14 +50,14 @@
if (contains(vgs, name))
{
// error popup text
- Error(sformat(_("The volume group \"%1\" already exists."), name ));
+ Popup::Error(sformat(_("The volume group \"%1\" already exists."), name ));
return false;
}
if (!check_vgname_dev(name))
{
// error popup text
- Error(sformat(_("The volume group name \"%1\" conflicts
+ Popup::Error(sformat(_("The volume group name \"%1\" conflicts
with another entry in the /dev directory.\n"), name));
return false;
}
@@ -70,8 +70,11 @@
{
if (!Integer::IsPowerOfTwo(pe_size) || pe_size < 1024)
{
- Error(_("The data entered is invalid. Insert a physical extent size larger than 1kB
-in powers of 2, for example, \"512kB\" or \"4MB\""));
+ Popup::Error(sformat(_("The data entered is invalid. Insert a physical extent size larger than %1
+in powers of 2, for example, \"%2\" or \"%3\""),
+ Storage::KByteToHumanStringWithPrecision(1, 1, true),
+ Storage::KByteToHumanStringWithPrecision(4, 1, true),
+ Storage::KByteToHumanStringWithPrecision(4*1024, 1, true)));
return false;
}
else
@@ -85,7 +88,7 @@
{
if (num < 1)
{
- Error(sformat(_("Select at least one device.")));
+ Popup::Error(sformat(_("Select at least one device.")));
return false;
}
else
@@ -100,14 +103,14 @@
if (size(lv_name) == 0)
{
// error popup text
- Error(_("Enter a name for the logical volume."));
+ Popup::Error(_("Enter a name for the logical volume."));
return false;
}
if (size(lv_name) > 128)
{
// error popup text
- Error(_("The name for the logical volume is longer than 128 characters."));
+ Popup::Error(_("The name for the logical volume is longer than 128 characters."));
return false;
}
@@ -116,7 +119,7 @@
if (findfirstnotof(lv_name, allowed_chars) != nil)
{
// error popup text
- Error(_("The name for the logical volume contains illegal characters. Allowed
+ Popup::Error(_("The name for the logical volume contains illegal characters. Allowed
are alphanumeric characters, \".\", \"_\", \"-\" and \"+\"."));
return false;
}
@@ -163,7 +166,8 @@
});
contents = add(contents, `Left(`InputField(`id("vgname"), "Volume Group Name")));
- contents = add(contents, `Left(`ComboBoxSelected(`id("pesize"), `opt(`editable), _("&Physical Extent Size"), pesizes_list, `id(pesize))));
+ contents = add(contents, `Left(`ComboBoxSelected(`id("pesize"), `opt(`editable),
+ _("&Physical Extent Size"), pesizes_list, `id(pesize))));
contents = add(contents, DevicesSelectionBox::Create(unused_pvs, [], fields, nil,
_("Available Physical Volumes:"),
@@ -379,12 +383,13 @@
string tmp = (string) UI::QueryWidget(`id(`size_input), `Value);
if (!Storage::HumanStringToKByte(tmp, size_k))
{
- Error(_("The size entered is invalid. Enter a value like \"500MB\" or \"1GB\"."));
+ Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."),
+ Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024)));
widget = `again;
}
else if (size_k < min_size_k || size_k > max_size_k)
{
- Error(sformat(_("The size entered is invalid. Enter a size beteen %1 and %2."),
+ Popup::Error(sformat(_("The size entered is invalid. Enter a size beteen %1 and %2."),
Storage::KByteToHumanString(min_size_k),
Storage::KByteToHumanString(max_size_k)));
widget = `again;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-lvm-lib.ycp new/yast2-storage-2.17.17/storage/src/include/ep-lvm-lib.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-lvm-lib.ycp 2008-08-07 18:32:52.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-lvm-lib.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -44,7 +44,7 @@
if (size(unused_pvs) < 1)
{
- Error(_("There are not enough suitable unused devices to create a volume group.
+ Popup::Error(_("There are not enough suitable unused devices to create a volume group.
To use LVM, at least one unused partition of type 0x8e (or 0x83) or one unused
RAID device is required. Change your partition table accordingly."));
@@ -77,7 +77,7 @@
{
if (device == nil)
{
- Error(_("No volume group selected."));
+ Popup::Error(_("No volume group selected."));
return;
}
@@ -104,7 +104,7 @@
if (!RemovePvs(vgname, devices_removed))
{
- Error(_("Failed to remove some physical devices. TODO"));
+ Popup::Error(_("Failed to remove some physical devices. TODO"));
// TODO: update data
@@ -128,7 +128,7 @@
{
if (device == nil)
{
- Error(_("No volume group selected."));
+ Popup::Error(_("No volume group selected."));
return;
}
@@ -164,7 +164,7 @@
{
if (device == nil)
{
- Error(_("No logical volume selected."));
+ Popup::Error(_("No logical volume selected."));
return;
}
@@ -177,7 +177,7 @@
if (target_map[device, "pe_free"]:0 == 0)
{
- Error(sformat(_("No free space left in the volume group \"%1\"."), vg_name));
+ Popup::Error(sformat(_("No free space left in the volume group \"%1\"."), vg_name));
return;
}
@@ -213,7 +213,7 @@
{
if (device == nil)
{
- Error(_("No logical volume selected."));
+ Popup::Error(_("No logical volume selected."));
return;
}
@@ -237,7 +237,7 @@
{
if (device == nil)
{
- Error(_("No logical volume selected."));
+ Popup::Error(_("No logical volume selected."));
return;
}
@@ -252,7 +252,7 @@
{
if (device == nil)
{
- Error(_("No logical volume selected."));
+ Popup::Error(_("No logical volume selected."));
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-main.ycp new/yast2-storage-2.17.17/storage/src/include/ep-main.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-main.ycp 2008-08-08 16:10:31.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-main.ycp 2008-08-14 22:54:07.000000000 +0200
@@ -178,7 +178,7 @@
`item(`id(`lvm), `icon(lvm_icon), _("Volume Management"), open(`lvm), subtree[`lvm]:[]),
`item(`id(`loop), `icon(loop_icon), _("Crypt Files"), open(`loop), subtree[`loop]:[]),
`item(`id(`dm), `icon(dm_icon), _("Device Mapper"), open(`dm), subtree[`dm]:[]),
- `item(`id(`nfs), `icon(nfs_icon), _("NFS"), open(`nfs), subtree[`nfs]:[]),
+ `item(`id(`nfs), `icon(nfs_icon), _("NFS"), open(`nfs)/*, subtree[`nfs]:[]*/),
`item(`id(`unused), `icon(unused_icon), _("Unused Devices"), open(`unused))
]),
`item(`id(`settings), `icon(settings_icon), _("Settings"), open(`settings)) ];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-nfs.ycp new/yast2-storage-2.17.17/storage/src/include/ep-nfs.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-nfs.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-nfs.ycp 2008-08-14 22:54:07.000000000 +0200
@@ -15,41 +15,49 @@
return StorageFields::PredicateDiskType(disk, partition, [`CT_NFS]);
}
- list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `mount_point ]);
+ //FIXME: check if nfs-client package is there
+ //list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `mount_point ]);
map target_map = Storage::GetTargetMap();
+ list < map > nfs_shares = target_map["/dev/nfs", "partitions"]:[];
- term table_header = StorageFields::TableHeader(fields);
- list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate);
+ //term table_header = StorageFields::TableHeader(fields);
+ //list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate);
+
+ term content = (term) WFM::CallFunction("nfs-client4part", ["CreateUI"]);
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
`VBox(
`HStretch(),
`IconAndHeading(_("Network File System (NFS)"), nfs_icon),
- `Table(`id(`table), `opt(`keepSorting, `notify),
+ /*`Table(`id(`table), `opt(`keepSorting, `notify),
table_header, table_contents),
`HBox(
`Left(`PushButton(`id(`add), _("Add NFS Path..."))),
`HStretch()
)
+ )*/
+ content
)
)
);
string helptext = _("<p>NFS TODO</p>");
- Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
+ WFM::CallFunction("nfs-client4part", [ "FromStorage", $[ "shares" : nfs_shares ] ] );
+ //Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
void HandleNfsMainPanel(any user_data, symbol widget)
{
- switch (widget)
+/* switch (widget)
{
case `add:
break;
- }
+ }*/
+ WFM::CallFunction("nfs-client4part", [ "HandleEvent", $[ "widget_id" : widget ] ]);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-raid-dialogs.ycp new/yast2-storage-2.17.17/storage/src/include/ep-raid-dialogs.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-raid-dialogs.ycp 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-raid-dialogs.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -24,8 +24,8 @@
{
map info = $[ "raid0" : "RAID0", "raid1" : "RAID1", "raid5" : "RAID5", "raid6" : "RAID6",
"raid10" : "RAID10", "multipath" : "Multipath RAID" ];
- Error(sformat(_("For %1, select at least %2 device.", "For %1, select at least %2 devices.", min_num),
- info[raid_type]:"error", min_num));
+ Popup::Error(sformat(_("For %1, select at least %2 device.", "For %1, select at least %2 devices.", min_num),
+ info[raid_type]:"error", min_num));
return false;
}
else
@@ -179,8 +179,8 @@
// help text
string help = _("<p><b>chunk size:</b><br>It is the smallest \"atomic\" mass
-of data that can be written to the devices. A reasonable chunk size for RAID 5 is 128KB. For RAID 0,
-32 KB is a good starting point. For RAID 1, the chunk size does not affect the array very much.</p>
+of data that can be written to the devices. A reasonable chunk size for RAID 5 is 128 kB. For RAID 0,
+32 kB is a good starting point. For RAID 1, the chunk size does not affect the array very much.</p>
");
// help text
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-raid-lib.ycp new/yast2-storage-2.17.17/storage/src/include/ep-raid-lib.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-raid-lib.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-raid-lib.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -44,7 +44,7 @@
if (size(unused_devices) < 2)
{
- Error(_("There are not enough suitable unused devices to create a RAID."));
+ Popup::Error(_("There are not enough suitable unused devices to create a RAID."));
return;
}
@@ -89,7 +89,7 @@
{
if (device == nil)
{
- Error(_("No RAID selected."));
+ Popup::Error(_("No RAID selected."));
return;
}
@@ -98,7 +98,7 @@
if (data["used_by"]:"" != "")
{
- Error(sformat(_("The RAID %1 is in use. It cannot be
+ Popup::Error(sformat(_("The RAID %1 is in use. It cannot be
edited. To edit %1, make sure it is not used."), device));
return;
}
@@ -120,7 +120,7 @@
{
if (device == nil)
{
- Error(_("No RAID selected."));
+ Popup::Error(_("No RAID selected."));
return;
}
@@ -129,14 +129,14 @@
if (!data["create"]:false)
{
- Error(sformat(_("The RAID %1 is already created on disk. It cannot be
+ Popup::Error(sformat(_("The RAID %1 is already created on disk. It cannot be
resized. To resize %1, remove it and create it again."), device));
return;
}
if (data["used_by"]:"" != "")
{
- Error(sformat(_("The RAID %1 is in use. It cannot be
+ Popup::Error(sformat(_("The RAID %1 is in use. It cannot be
resized. To resize %1, make sure it is not used."), device));
return;
}
@@ -159,7 +159,7 @@
if (!RemoveDevices(raid_nr, devices_removed))
{
- Error(_("Failed to remove some devices. TODO"));
+ Popup::Error(_("Failed to remove some devices. TODO"));
}
UpdateNavigationTree(nil);
@@ -173,7 +173,7 @@
{
if (device == nil)
{
- Error(_("No RAID selected."));
+ Popup::Error(_("No RAID selected."));
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/include/ep-settings.ycp new/yast2-storage-2.17.17/storage/src/include/ep-settings.ycp
--- old/yast2-storage-2.17.15/storage/src/include/ep-settings.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/include/ep-settings.ycp 2008-08-13 15:35:57.000000000 +0200
@@ -16,7 +16,7 @@
$[ `label : _("Used by"), `fields : [ `used_by ] ],
$[ `label : _("BIOS ID"), `fields : [ `bios_id ] ],
$[ `label : _("Cylinder information"), `fields : toset([ `start_cyl, `end_cyl, `num_cyl, `cyl_size ]) ],
- $[ `label : _("Fibre Channel information"), `fields : toset([ `fc_wwpn, `fc_port_id ]) ]
+ $[ `label : _("Fibre Channel information"), `fields : toset([ `fc_wwpn, `fc_fcp_lun, `fc_port_id ]) ]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/modules/Partitions.ycp new/yast2-storage-2.17.17/storage/src/modules/Partitions.ycp
--- old/yast2-storage-2.17.15/storage/src/modules/Partitions.ycp 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/modules/Partitions.ycp 2008-08-13 16:02:33.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Provides information about partitions
*
- * $Id: Partitions.ycp 49899 2008-08-09 08:45:50Z aschnell $
+ * $Id: Partitions.ycp 50024 2008-08-13 14:01:43Z aschnell $
*/
{
module "Partitions";
@@ -565,23 +565,11 @@
return( file );
};
-global define string ToHexString( integer num )
- ``{
- string to_hex = "0123456789ABCDEF";
- string ret = "";
- if( num>256 )
- {
- ret = sformat("0x%1%2%3", substring( to_hex, num/256, 1 ),
- substring( to_hex, (num%256)/16, 1 ),
- substring( to_hex, num%16, 1 ) );
- }
- else
- {
- ret = sformat("0x%1%2", substring( to_hex, num/16, 1 ),
- substring( to_hex, num%16, 1 ) );
- }
- return( ret );
- }
+
+global string ToHexString(integer num)
+{
+ return "0x" + toupper(substring(tohexstring(num, 2), 2));
+}
global string FsIdToString(integer fs_id)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/modules/StorageDevices.ycp new/yast2-storage-2.17.17/storage/src/modules/StorageDevices.ycp
--- old/yast2-storage-2.17.15/storage/src/modules/StorageDevices.ycp 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/modules/StorageDevices.ycp 2008-08-15 18:10:57.000000000 +0200
@@ -14,7 +14,7 @@
* - removable drives (ZIP)
* - floppy devices
*
- * $Id: StorageDevices.ycp 49540 2008-07-31 12:22:02Z aschnell $
+ * $Id: StorageDevices.ycp 50134 2008-08-15 15:51:31Z aschnell $
*
* Author:
* Klaus Kaempf (initial)
@@ -451,7 +451,7 @@
// do the probing
list<map> all_disks = (list<map>) SCR::Read(.probe.disk_raid);
- y2milestone( "localProbe: disks probed");
+ y2milestone( "localProbe: disks probed all_disks:%1", all_disks);
if( size(all_disks)==0 )
{
@@ -497,7 +497,11 @@
y2milestone( "localProbe: fake_raid %1", fake_raid );
}
- y2milestone( "localProbe: is_zip %1 notready:%2 softraid %3 no_disk:%4",
+ map res_fc = disk["resource", "fc", 0]:$[];
+ if (res_fc != $[])
+ target["fc"] = res_fc;
+
+ y2milestone( "localProbe: is_zip:%1 notready:%2 softraid:%3 no_disk:%4",
is_zip, notready, disk["softraiddisk"]:false, no_disk );
if( no_disk )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/modules/StorageFields.ycp new/yast2-storage-2.17.17/storage/src/modules/StorageFields.ycp
--- old/yast2-storage-2.17.15/storage/src/modules/StorageFields.ycp 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/modules/StorageFields.ycp 2008-08-15 18:10:57.000000000 +0200
@@ -632,6 +632,39 @@
return sformat(_("File Path: %1"), value);
}
+ case `fc_wwpn:
+ {
+ string value = "";
+ if (haskey(data["fc"]:$[], "wwpn"))
+ value = "0x" + toupper(substring(tohexstring(data["fc", "wwpn"]:0, 16), 2));
+ if (style == `table)
+ return value;
+ else
+ return sformat(_("FC WWPN: %1"), value);
+ }
+
+ case `fc_fcp_lun:
+ {
+ string value = "";
+ if (haskey(data["fc"]:$[], "fcp_lun"))
+ value = tostring(data["fc", "fcp_lun"]:0);
+ if (style == `table)
+ return value;
+ else
+ return sformat(_("FC LUN: %1"), value);
+ }
+
+ case `fc_port_id:
+ {
+ string value = "";
+ if (haskey(data["fc"]:$[], "port_id"))
+ value = "0x" + toupper(substring(tohexstring(data["fc", "port_id"]:0, 6), 2));
+ if (style == `table)
+ return value;
+ else
+ return sformat(_("FC Port ID: %1"), value);
+ }
+
default:
{
y2error("unknown field %1", field);
@@ -891,6 +924,8 @@
return _("File System:");
case `heading_hd:
return _("Hard Disk:");
+ case `heading_fc:
+ return _("Fibre Channel:");
case `heading_lvm:
return _("LVM:");
case `heading_md:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/storage/src/modules/Storage.ycp new/yast2-storage-2.17.17/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.17.15/storage/src/modules/Storage.ycp 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/storage/src/modules/Storage.ycp 2008-08-12 17:25:55.000000000 +0200
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 49899 2008-08-09 08:45:50Z aschnell $
+ * $Id: Storage.ycp 49995 2008-08-12 15:25:54Z aschnell $
*/
{
@@ -343,8 +343,10 @@
y2milestone("InitLibstorage");
sint = CreateInterface(readonly);
- if (sint == nil)
+ if (sint == nil) {
+ y2error("Storage::CreateInterface failed");
return false;
+ }
if (Stage::initial())
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.15/VERSION new/yast2-storage-2.17.17/VERSION
--- old/yast2-storage-2.17.15/VERSION 2008-08-09 11:00:33.000000000 +0200
+++ new/yast2-storage-2.17.17/VERSION 2008-08-13 16:02:33.000000000 +0200
@@ -1 +1 @@
-2.17.15
+2.17.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org