May 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57296 - /trunk/storage/libstorage/src/MdCo.cc
by aschnell＠svn.opensuse.org 22 May '09

22 May '09

Author: aschnell Date: Fri May 22 11:36:40 2009 New Revision: 57296 URL: http://svn.opensuse.org/viewcvs/yast?rev=57296&view=rev Log: - tmpdir cleanup Modified: trunk/storage/libstorage/src/MdCo.cc Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Fri May 22 11:36:40 2009 @@ -563,12 +563,10 @@ if( val ) { string mdconf = tmpDir + "/mdadm.conf"; - string cmd = "echo 1 > /sys/module/md_mod/parameters/start_ro"; - c.execute( cmd ); - cmd = MDADMBIN " --examine --scan --config=partitions >" + mdconf; - c.execute( cmd ); - cmd = MDADMBIN " --assemble --scan --config=" + mdconf; - c.execute( cmd ); + c.execute("echo 1 > /sys/module/md_mod/parameters/start_ro"); + c.execute(MDADMBIN " --examine --scan --config=partitions > " + mdconf); + c.execute(MDADMBIN " --assemble --scan --config=" + mdconf); + unlink(mdconf.c_str()); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57295 - in /trunk/storage/libstorage/src: Storage.cc Storage.h Volume.cc
by aschnell＠svn.opensuse.org 22 May '09

22 May '09

Author: aschnell Date: Fri May 22 11:18:58 2009 New Revision: 57295 URL: http://svn.opensuse.org/viewcvs/yast?rev=57295&view=rev Log: - tmpdir cleanup Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri May 22 11:18:58 2009 @@ -116,7 +116,7 @@ Storage::initialize() { initialized = true; - char tbuf[32] = "/tmp/liby2storageXXXXXX"; + char tbuf[32] = "/tmp/libstorage-XXXXXX"; if( mkdtemp( tbuf )==NULL ) { y2err("tmpdir creation " << tbuf << " failed. Aborting..."); @@ -125,7 +125,6 @@ else { tempdir = tbuf; - rmdir( tempdir.c_str() ); } if( access( "/etc/sysconfig/storage", R_OK )==0 ) { @@ -273,15 +272,11 @@ logContainersAndVolumes(logdir); clearPointerList(cont); deleteBackups(); - if( !tempdir.empty() && access( tempdir.c_str(), R_OK )==0 ) - { - SystemCmd c( "rmdir " + tempdir ); - if( c.retcode()!=0 ) - { - y2err("stray tmpfile"); - c.execute( "ls -l" + tempdir ); - } - } + if (!tempdir.empty() && rmdir(tempdir.c_str()) != 0) + { + y2err("stray tmpfile"); + SystemCmd("ls -l " + quote(tempdir)); + } delete fstab; y2mil("destructed Storage"); } @@ -293,12 +288,6 @@ detectObjects(); } -const string& Storage::tmpDir() const - { - if( access( tempdir.c_str(), W_OK )!= 0 ) - mkdir( tempdir.c_str(), 0700 ); - return( tempdir ); - } void Storage::detectArch() @@ -5484,7 +5473,6 @@ { umountDevice( device ); rmdir( mp.c_str() ); - rmdir( tmpDir().c_str() ); } if( vol->needCrsetup() && vol->doCrsetup() ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Fri May 22 11:18:58 2009 @@ -222,7 +222,7 @@ const string& tDir() const { return( testdir ); } const string& root() const { return( rootprefix ); } string prependRoot(const string& mp) const; - const string& tmpDir() const; + const string& tmpDir() const { return tempdir; } bool efiBoot() const { return efiboot; } static const string& arch() { return( proc_arch ); } static bool isPPCMac() { return( is_ppc_mac ); } Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Fri May 22 11:18:58 2009 @@ -1291,7 +1291,6 @@ if( needrmdir ) { rmdir( mpoint.c_str() ); - rmdir( cont->getStorage()->tmpDir().c_str() ); } } break; @@ -1749,7 +1748,6 @@ } unlink( fname.c_str() ); rmdir( mpname.c_str() ); - rmdir( cont->getStorage()->tmpDir().c_str() ); y2mil("ret:" << encTypeString(ret)); return( ret ); } @@ -1790,7 +1788,6 @@ if( !fname.empty() ) { unlink( fname.c_str() ); - rmdir( cont->getStorage()->tmpDir().c_str() ); } Storage::waitForDevice(loop_dev); } @@ -1913,7 +1910,6 @@ } } unlink( fname.c_str() ); - rmdir( cont->getStorage()->tmpDir().c_str() ); Storage::waitForDevice(dmcrypt_dev); } if( ret==0 ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57294 - in /trunk/yast2/library: cwm/doc/Makefile.am packages/src/PackageSystem.ycp runlevel/src/ag_initscripts
by mvidner＠svn.opensuse.org 22 May '09

22 May '09

Author: mvidner Date: Fri May 22 10:54:19 2009 New Revision: 57294 URL: http://svn.opensuse.org/viewcvs/yast?rev=57294&view=rev Log: OOPS, the previous commit (r57293) accidentally included unrelated changes. Reverted. Modified: trunk/yast2/library/cwm/doc/Makefile.am trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/library/runlevel/src/ag_initscripts Modified: trunk/yast2/library/cwm/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/Makefile.a… ============================================================================== --- trunk/yast2/library/cwm/doc/Makefile.am (original) +++ trunk/yast2/library/cwm/doc/Makefile.am Fri May 22 10:54:19 2009 @@ -1,6 +1,6 @@ # Makefile.am for YCP module .../doc -include ${srcdir}/docbook-xmlto.ami +include ${srcdir}/docbook-docbook-toys.ami SUBDIRS = autodocs @@ -8,7 +8,7 @@ html_DATA = # cwm.html -EXTRA_DIST = $(html_DATA) docbook-*.ami +EXTRA_DIST = $(html_DATA) docbook-docbook-toys.ami DOCBOOK_MAIN = cwm.xml DOCBOOK_FILES = $(wildcard *.xml) Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Fri May 22 10:54:19 2009 @@ -401,8 +401,6 @@ if (SCR::Read (.target.size, "/usr/bin/rpmqpack") > -1) { _rpm_query_binary = "/usr/bin/rpmqpack "; // than rpm itself - } else if (SCR::Read (.target.size, "/usr/bin/dpkg") > -1) { - _rpm_query_binary = "/usr/bin/dpkg -s "; } else if (SCR::Read (.target.size, "/bin/rpm") > -1) { _rpm_query_binary = "/bin/rpm -q "; } @@ -421,7 +419,7 @@ // Unfortunately, initializing Pkg reads the RPM database... // so we must avoid it. // added --whatprovides due to bug #76181 - return 0 == (integer) SCR::Execute(.target.bash, "~/bin/rpm -q " + package); + return 0 == (integer) SCR::Execute(.target.bash, "rpm -q --whatprovides " + package); // return Pkg::IsProvided (package); } Modified: trunk/yast2/library/runlevel/src/ag_initscripts URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/ag_in… ============================================================================== --- trunk/yast2/library/runlevel/src/ag_initscripts (original) +++ trunk/yast2/library/runlevel/src/ag_initscripts Fri May 22 10:54:19 2009 @@ -83,9 +83,6 @@ FILENAME ~ /\.swp$/ || FILENAME ~ /\.core$/ || FILENAME ~ /~$/ || FILENAME ~ /boot\.klog/ || FILENAME ~ /^Makefile/ || -# Fedora - FILENAME == /functions/ || - FILENAME == /killall/ || # why was this here?? # bug 34775: dont skip boot.hotplug-beta, boot.restore_permissions # FILENAME ~ /\.[^0-9$.#_\-\\*]*[0-9$.#_\-\\*]/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57293 - in /trunk/yast2: library/cwm/doc/Makefile.am library/packages/src/PackageSystem.ycp library/runlevel/src/ag_initscripts package/yast2.changes scripts/yast2-completion.sh
by mvidner＠svn.opensuse.org 22 May '09

22 May '09

Author: mvidner Date: Fri May 22 10:49:24 2009 New Revision: 57293 URL: http://svn.opensuse.org/viewcvs/yast?rev=57293&view=rev Log: yast2-completion.sh: removed <(process substitution) so that it works even with POSIXLY_CORRECT=1 (bnc#504844). Modified: trunk/yast2/library/cwm/doc/Makefile.am trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/library/runlevel/src/ag_initscripts trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2-completion.sh Modified: trunk/yast2/library/cwm/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/Makefile.a… ============================================================================== --- trunk/yast2/library/cwm/doc/Makefile.am (original) +++ trunk/yast2/library/cwm/doc/Makefile.am Fri May 22 10:49:24 2009 @@ -1,6 +1,6 @@ # Makefile.am for YCP module .../doc -include ${srcdir}/docbook-docbook-toys.ami +include ${srcdir}/docbook-xmlto.ami SUBDIRS = autodocs @@ -8,7 +8,7 @@ html_DATA = # cwm.html -EXTRA_DIST = $(html_DATA) docbook-docbook-toys.ami +EXTRA_DIST = $(html_DATA) docbook-*.ami DOCBOOK_MAIN = cwm.xml DOCBOOK_FILES = $(wildcard *.xml) Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Fri May 22 10:49:24 2009 @@ -401,6 +401,8 @@ if (SCR::Read (.target.size, "/usr/bin/rpmqpack") > -1) { _rpm_query_binary = "/usr/bin/rpmqpack "; // than rpm itself + } else if (SCR::Read (.target.size, "/usr/bin/dpkg") > -1) { + _rpm_query_binary = "/usr/bin/dpkg -s "; } else if (SCR::Read (.target.size, "/bin/rpm") > -1) { _rpm_query_binary = "/bin/rpm -q "; } @@ -419,7 +421,7 @@ // Unfortunately, initializing Pkg reads the RPM database... // so we must avoid it. // added --whatprovides due to bug #76181 - return 0 == (integer) SCR::Execute(.target.bash, "rpm -q --whatprovides " + package); + return 0 == (integer) SCR::Execute(.target.bash, "~/bin/rpm -q " + package); // return Pkg::IsProvided (package); } Modified: trunk/yast2/library/runlevel/src/ag_initscripts URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/ag_in… ============================================================================== --- trunk/yast2/library/runlevel/src/ag_initscripts (original) +++ trunk/yast2/library/runlevel/src/ag_initscripts Fri May 22 10:49:24 2009 @@ -83,6 +83,9 @@ FILENAME ~ /\.swp$/ || FILENAME ~ /\.core$/ || FILENAME ~ /~$/ || FILENAME ~ /boot\.klog/ || FILENAME ~ /^Makefile/ || +# Fedora + FILENAME == /functions/ || + FILENAME == /killall/ || # why was this here?? # bug 34775: dont skip boot.hotplug-beta, boot.restore_permissions # FILENAME ~ /\.[^0-9$.#_\-\\*]*[0-9$.#_\-\\*]/ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri May 22 10:49:24 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 22 10:47:43 CEST 2009 - mvidner(a)suse.cz + +- yast2-completion.sh: removed <(process substitution) so that it + works even with POSIXLY_CORRECT=1 (bnc#504844). + +------------------------------------------------------------------- Wed May 20 12:45:47 CEST 2009 - aschnell(a)suse.de - moved .proc.mounts agent from yast2-installation to yast2 (bnc Modified: trunk/yast2/scripts/yast2-completion.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2-completion.s… ============================================================================== --- trunk/yast2/scripts/yast2-completion.sh (original) +++ trunk/yast2/scripts/yast2-completion.sh Fri May 22 10:49:24 2009 @@ -42,18 +42,18 @@ if [[ -n $prevprev && $prevprev == $mod ]]; then # build option list # prev is a module option - while read line ; do + MODOPTS=(`LC_ALL=C $YAST $mod $prev help 2>&1 | while read line ; do case "$line" in Options:*) while read opt rest ; do case "$opt" in "") break 2 ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; esac - done < <(LC_ALL=C $YAST $mod $prev help 2>&1) + done `) len=${#cur} idx=0 for pval in ${MODOPTS[@]}; do @@ -67,14 +67,14 @@ # previous option is a known yast module? if [[ $prev == $mod ]]; then # build option list - while read line ; do + MODOPTS=(` LC_ALL=C $YAST $mod help 2>&1 | while read line ; do case "$line" in Basic\ Syntax:*) while read rest rest opt rest ; do case "$opt" in \<*\>) ;; "") break ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; @@ -82,12 +82,12 @@ while read opt rest ; do case "$opt" in "") break 2 ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; esac - done < <(LC_ALL=C $YAST $mod help 2>&1) + done `) len=${#cur} idx=0 for pval in ${MODOPTS[@]}; do -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57292 - in /branches/tmp/tgoettlicher/yast2cc_rewrite/src: yqdesktopfilesmodel.cpp yqdesktopfilesmodel.h yqmodulegroupsmodel.cpp yqmodulegroupsmodel.h
by kmachalkova＠svn.opensuse.org 21 May '09

21 May '09

Author: kmachalkova Date: Thu May 21 17:16:34 2009 New Revision: 57292 URL: http://svn.opensuse.org/viewcvs/yast?rev=57292&view=rev Log: Added personal(izable) items into group view + render headlines in bold Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.h branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.h Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp Thu May 21 17:16:34 2009 @@ -207,7 +207,6 @@ else qSort(d->desktop_files.begin(), d->desktop_files.end(), qGreater<QString>()); emit layoutChanged(); - qDebug() << "sorting" << endl; return; } @@ -281,11 +280,18 @@ } } -void YQDesktopFilesModel::addPropertyToDesktopFile( QString &fname, QString &key, QString &value) +void YQDesktopFilesModel::addPropertyToDesktopFile( QString &fname, const QString &key, QString &value) { if (d->cache.find( fname ) != d->cache.end()) { d->cache[ fname ].insert( key, value ); } + else + { + PropertyMap pm; + pm[key] = value; + + d->cache[ fname ] = pm; + } } #include "yqdesktopfilesmodel.moc" Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.h (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.h Thu May 21 17:16:34 2009 @@ -86,7 +86,7 @@ void addDesktopFile(QString &fname); void addDesktopFiles( QStringList &flist); - void addPropertyToDesktopFile( QString &fname, QString &key, QString &value ); + void addPropertyToDesktopFile( QString &fname, const QString &key, QString &value ); protected: void readDesktopFilesDirectories(); Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.cpp Thu May 21 17:16:34 2009 @@ -10,6 +10,8 @@ \---------------------------------------------------------------------*/ #include <QDebug> +#include <QFont> +#include <QFontMetrics> #include <QSettings> #include <QDir> #include <QIcon> @@ -33,6 +35,7 @@ addIconPath("/usr/share/YaST2/theme/current/icons/32x32/apps"); addIconPath("/usr/share/icons/hicolor/32x32/apps"); reindex(); + addPersonalStuff(); } YQModuleGroupsModel::~YQModuleGroupsModel() @@ -61,6 +64,31 @@ return skey; } +void YQModuleGroupsModel::addPersonalStuff() +{ + QList < QPair <QString, QString> > fake; + + fake << QPair<QString, QString> ( "Personal.desktop", "Personal") + << QPair<QString, QString> ( "Favourites.desktop", "Favourites") + << QPair<QString, QString> ( "Recent.desktop", "Recently Used") + << QPair<QString, QString> ( "Modules.desktop", "Modules"); + + QPair <QString, QString> p; + + foreach( p, fake ) + { + addDesktopFile( p.first ); + addPropertyToDesktopFile( p.first, "Name", p.second ); + addPropertyToDesktopFile( p.first, "X-SuSE-YaST-Group", p.second ); + } + + typeMap["Personal"] = Headline; + typeMap["Modules"] = Headline; + typeMap["Favourites"] = Special; + typeMap["Recently Used"] = Special; + +} + void YQModuleGroupsModel::reindex() { // pairs, because sort keys don't have to be unique :( @@ -78,17 +106,33 @@ d->desktop_files.clear(); QPair<int,QString> p; - foreach( p , sortKeys ) + foreach( p, sortKeys ) { d->desktop_files << p.second; } } - QVariant YQModuleGroupsModel::data( const QModelIndex &index, int role ) const { - return YQDesktopFilesModel::data(index, role); + if (role == Qt::FontRole ) + { + QString name = propertyValue( index, "Name" ).toString(); + QFont f; + + if( typeMap[name] == Headline) + { + f.setBold(true); + QFontMetrics fm(f); + f.setPixelSize( (int) (fm.height() * 1.05) ); + QVariant myData = QVariant(f); + return myData; + } + else + return QVariant(); + } + else + return YQDesktopFilesModel::data(index, role); } #include "yqmodulegroupsmodel.moc" Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.h (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.h Thu May 21 17:16:34 2009 @@ -27,6 +27,13 @@ Q_OBJECT public: + enum Type + { + Regular, + Headline, + Special + }; + YQModuleGroupsModel( QObject * parent = 0 ); ~YQModuleGroupsModel(); @@ -48,7 +55,10 @@ QString groupId( const QModelIndex &idx ) const; private: + QMap <QString, Type> typeMap; + void reindex(); + void addPersonalStuff(); }; #endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57291 - /branches/tmp/SLE-11-SP1-Stash/slp-server/src/dialogs.ycp
by mzugec＠svn.opensuse.org 21 May '09

21 May '09

Author: mzugec Date: Thu May 21 14:15:26 2009 New Revision: 57291 URL: http://svn.opensuse.org/viewcvs/yast?rev=57291&view=rev Log: added validation Modified: branches/tmp/SLE-11-SP1-Stash/slp-server/src/dialogs.ycp Modified: branches/tmp/SLE-11-SP1-Stash/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/slp-serv… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/slp-server/src/dialogs.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/slp-server/src/dialogs.ycp Thu May 21 14:15:26 2009 @@ -22,6 +22,7 @@ import "LogView"; import "IP"; import "String"; +import "Address"; include "slp-server/helps.ycp"; void initServerSettings(string key); @@ -580,11 +581,9 @@ { boolean ip_valid = true; if ((string)UI::QueryWidget(`id(`ip), `Value) == "") ip_valid = false; -/* foreach(string ip, splitstring((string)UI::QueryWidget(`id(`ip), `Value), ","), { - if(!IP::Check(String::CutBlanks(ip))) ip_valid = false; + if(!Address::Check4(String::CutBlanks(ip)) && !Address::Check6(String::CutBlanks(ip))) ip_valid = false; }); -*/ if (!ip_valid){ Popup::Error (_("Scope and IP address must be inserted.")); return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57290 - /branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp
by mzugec＠svn.opensuse.org 21 May '09

21 May '09

Author: mzugec Date: Thu May 21 14:13:32 2009 New Revision: 57290 URL: http://svn.opensuse.org/viewcvs/yast?rev=57290&view=rev Log: added validation Modified: branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/slp-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/slp-server/src/dialogs.ycp Thu May 21 14:13:32 2009 @@ -22,6 +22,7 @@ import "LogView"; import "IP"; import "String"; +import "Address"; include "slp-server/helps.ycp"; void initServerSettings(string key); @@ -580,11 +581,9 @@ { boolean ip_valid = true; if ((string)UI::QueryWidget(`id(`ip), `Value) == "") ip_valid = false; -/* foreach(string ip, splitstring((string)UI::QueryWidget(`id(`ip), `Value), ","), { - if(!IP::Check(String::CutBlanks(ip))) ip_valid = false; + if(!Address::Check4(String::CutBlanks(ip)) && !Address::Check6(String::CutBlanks(ip))) ip_valid = false; }); -*/ if (!ip_valid){ Popup::Error (_("Scope and IP address must be inserted.")); return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57289 - /trunk/slp-server/src/dialogs.ycp
by mzugec＠svn.opensuse.org 21 May '09

21 May '09

Author: mzugec Date: Thu May 21 14:06:09 2009 New Revision: 57289 URL: http://svn.opensuse.org/viewcvs/yast?rev=57289&view=rev Log: added validation Modified: trunk/slp-server/src/dialogs.ycp Modified: trunk/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/dialogs.ycp?rev=5… ============================================================================== --- trunk/slp-server/src/dialogs.ycp (original) +++ trunk/slp-server/src/dialogs.ycp Thu May 21 14:06:09 2009 @@ -22,6 +22,7 @@ import "LogView"; import "IP"; import "String"; +import "Address"; include "slp-server/helps.ycp"; void initServerSettings(string key); @@ -580,11 +581,9 @@ { boolean ip_valid = true; if ((string)UI::QueryWidget(`id(`ip), `Value) == "") ip_valid = false; -/* foreach(string ip, splitstring((string)UI::QueryWidget(`id(`ip), `Value), ","), { - if(!IP::Check(String::CutBlanks(ip))) ip_valid = false; + if(!Address::Check4(String::CutBlanks(ip)) && !Address::Check6(String::CutBlanks(ip))) ip_valid = false; }); -*/ if (!ip_valid){ Popup::Error (_("Scope and IP address must be inserted.")); return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57288 - /tags/branch-SLE-11-SP1-Stash-2_17_3/slp-server/
by mzugec＠svn.opensuse.org 21 May '09

21 May '09

Author: mzugec Date: Thu May 21 10:55:29 2009 New Revision: 57288 URL: http://svn.opensuse.org/viewcvs/yast?rev=57288&view=rev Log: Created tag branch-SLE-11-SP1-Stash-2_17_3 for slp-server Added: tags/branch-SLE-11-SP1-Stash-2_17_3/slp-server/ - copied from r57287, branches/tmp/SLE-11-SP1-Stash/slp-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57287 - /tags/branch-SLE-11-SP1-Stash-2_17_3/
by mzugec＠svn.opensuse.org 21 May '09

21 May '09

Author: mzugec Date: Thu May 21 10:55:26 2009 New Revision: 57287 URL: http://svn.opensuse.org/viewcvs/yast?rev=57287&view=rev Log: Created tag branch-SLE-11-SP1-Stash-2_17_3 Added: tags/branch-SLE-11-SP1-Stash-2_17_3/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0