August 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> master : Use empty arch as default arg, not noarch.
by Michael Andres 31 Aug '09

31 Aug '09

ref: refs/heads/master commit d757c120a528188f5a8f6818a6d1126e14637aee Author: Michael Andres <ma(a)suse.de> Date: Mon Aug 31 12:13:17 2009 +0200 Use empty arch as default arg, not noarch. --- tests/lib/TestSetup.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h index 4108257..0fdbae4 100644 --- a/tests/lib/TestSetup.h +++ b/tests/lib/TestSetup.h @@ -81,14 +81,14 @@ class TestSetup typedef TestSetupOptions Options; public: - TestSetup( const Arch & sysarch_r = Arch() ) + TestSetup( const Arch & sysarch_r = Arch_empty ) { _ctor( Pathname(), sysarch_r, Options() ); } - TestSetup( const Pathname & rootdir_r, const Arch & sysarch_r = Arch(), const Options & options_r = Options() ) + TestSetup( const Pathname & rootdir_r, const Arch & sysarch_r = Arch_empty, const Options & options_r = Options() ) { _ctor( rootdir_r, sysarch_r, options_r ); } TestSetup( const Pathname & rootdir_r, const Options & options_r ) - { _ctor( rootdir_r, Arch(), options_r ); } + { _ctor( rootdir_r, Arch_empty, options_r ); } ~TestSetup() { USR << (_tmprootdir.path() == _rootdir ? "DELETE" : "KEEP") << " TESTSETUP below " << _rootdir << endl; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : Use empty arch as default arg, not noarch.
by Michael Andres 31 Aug '09

31 Aug '09

ref: refs/heads/ma-misc commit d757c120a528188f5a8f6818a6d1126e14637aee Author: Michael Andres <ma(a)suse.de> Date: Mon Aug 31 12:13:17 2009 +0200 Use empty arch as default arg, not noarch. --- tests/lib/TestSetup.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h index 4108257..0fdbae4 100644 --- a/tests/lib/TestSetup.h +++ b/tests/lib/TestSetup.h @@ -81,14 +81,14 @@ class TestSetup typedef TestSetupOptions Options; public: - TestSetup( const Arch & sysarch_r = Arch() ) + TestSetup( const Arch & sysarch_r = Arch_empty ) { _ctor( Pathname(), sysarch_r, Options() ); } - TestSetup( const Pathname & rootdir_r, const Arch & sysarch_r = Arch(), const Options & options_r = Options() ) + TestSetup( const Pathname & rootdir_r, const Arch & sysarch_r = Arch_empty, const Options & options_r = Options() ) { _ctor( rootdir_r, sysarch_r, options_r ); } TestSetup( const Pathname & rootdir_r, const Options & options_r ) - { _ctor( rootdir_r, Arch(), options_r ); } + { _ctor( rootdir_r, Arch_empty, options_r ); } ~TestSetup() { USR << (_tmprootdir.path() == _rootdir ? "DELETE" : "KEEP") << " TESTSETUP below " << _rootdir << endl; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Improve capability parsing by avoiding regex and try/catch
by Michael Andres 28 Aug '09

28 Aug '09

ref: refs/heads/master commit 9218d2d12cc379adc0e3abeddd6aa4d776ff6730 Author: Michael Andres <ma(a)suse.de> Date: Fri Aug 28 18:03:55 2009 +0200 Improve capability parsing by avoiding regex and try/catch --- VERSION.cmake | 2 +- zypp/Capability.cc | 124 ++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 101 insertions(+), 25 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 3a304f4..bc01d7a 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "11") SET(LIBZYPP_MINOR "13") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") # # LAST RELEASED: 6.13.2 (11) # (The number in parenthesis is LIBZYPP_COMPATMINOR) diff --git a/zypp/Capability.cc b/zypp/Capability.cc index e60187d..0e4f6e3 100644 --- a/zypp/Capability.cc +++ b/zypp/Capability.cc @@ -33,6 +33,104 @@ namespace zypp /////////////////////////////////////////////////////////////////// namespace { ///////////////////////////////////////////////////////////////// + + /** backward skip whitespace starting at pos_r */ + inline std::string::size_type backskipWs( const std::string & str_r, std::string::size_type pos_r ) + { + for ( ; pos_r != std::string::npos; --pos_r ) + { + char ch = str_r[pos_r]; + if ( ch != ' ' && ch != '\t' ) + break; + } + return pos_r; + } + + /** backward skip non-whitespace starting at pos_r */ + inline std::string::size_type backskipNWs( const std::string & str_r, std::string::size_type pos_r ) + { + for ( ; pos_r != std::string::npos; --pos_r ) + { + char ch = str_r[pos_r]; + if ( ch == ' ' || ch == '\t' ) + break; + } + return pos_r; + } + + /** Split any 'op edition' from str_r */ + void splitOpEdition( std::string & str_r, Rel & op_r, Edition & ed_r ) + { + if ( str_r.empty() ) + return; + std::string::size_type ch( str_r.size()-1 ); + + // check whether the one but last word is a valid Rel: + if ( (ch = backskipWs( str_r, ch )) != std::string::npos ) + { + std::string::size_type ee( ch ); + if ( (ch = backskipNWs( str_r, ch )) != std::string::npos ) + { + std::string::size_type eb( ch ); + if ( (ch = backskipWs( str_r, ch )) != std::string::npos ) + { + std::string::size_type oe( ch ); + ch = backskipNWs( str_r, ch ); // now before 'op'? begin + if ( op_r.parseFrom( str_r.substr( ch+1, oe-ch ) ) ) + { + // found a legal 'op' + ed_r = Edition( str_r.substr( eb+1, ee-eb ) ); + if ( ch != std::string::npos ) // 'op' is not at str_r begin, so skip WS + ch = backskipWs( str_r, ch ); + str_r.erase( ch+1 ); + return; + } + } + } + } + // HERE: Didn't find 'name op edition' + // As a convenience we check for an embeded 'op' (not surounded by WS). + // But just '[<=>]=?|!=' and not inside '()'. + ch = str_r.find_last_of( "<=>)" ); + if ( ch != std::string::npos && str_r[ch] != ')' ) + { + std::string::size_type oe( ch ); + + // do edition first: + ch = str_r.find_first_not_of( " \t", oe+1 ); + if ( ch != std::string::npos ) + ed_r = Edition( str_r.substr( ch ) ); + + // now finish op: + ch = oe-1; + if ( str_r[oe] != '=' ) // '[<>]' + { + op_r = ( str_r[oe] == '<' ) ? Rel::LT : Rel::GT; + } + else + { // '?=' + if ( ch != std::string::npos ) + { + switch ( str_r[ch] ) + { + case '<': --ch; op_r = Rel::LE; break; + case '>': --ch; op_r = Rel::GE; break; + case '!': --ch; op_r = Rel::NE; break; + case '=': --ch; // fall through + default: op_r = Rel::EQ; break; + } + } + } + + // finally name: + if ( ch != std::string::npos ) // 'op' is not at str_r begin, so skip WS + ch = backskipWs( str_r, ch ); + str_r.erase( ch+1 ); + return; + } + // HERE: It's a plain 'name' + } + /** Build \ref Capability from data. No parsing required. */ sat::detail::IdType relFromStr( ::_Pool * pool_r, @@ -118,35 +216,13 @@ namespace zypp const std::string & str_r, const ResKind & kind_r, Capability::CtorFlag flag_r ) { - // strval_r has at least two words which could make 'op edition'? - // improve regex! - static const str::regex rx( "(.*[^ \t])([ \t]+)([^ \t]+)([ \t]+)([^ \t]+)" ); - static str::smatch what; - std::string name( str_r ); Rel op; Edition ed; - if ( flag_r == Capability::UNPARSED - && str_r.find(' ') != std::string::npos - && str::regex_match( str_r, what, rx ) ) + if ( flag_r == Capability::UNPARSED ) { - try - { - Rel cop( what[3] ); - Edition ced( what[5] ); - name = what[1]; - op = cop; - ed = ced; - } - catch ( Exception & excpt ) - { - // So they don't make valid 'op edition' - ZYPP_CAUGHT( excpt ); - DBG << "Trying named relation for: " << str_r << endl; - } + splitOpEdition( name, op, ed ); } - //else - // not a versioned relation if ( arch_r.empty() ) return relFromStr( pool_r, name, op, ed, kind_r ); // parses for name[.arch] -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : Improve capability parsing by avoiding regex and try/catch
by Michael Andres 28 Aug '09

28 Aug '09

ref: refs/heads/ma-misc commit 9218d2d12cc379adc0e3abeddd6aa4d776ff6730 Author: Michael Andres <ma(a)suse.de> Date: Fri Aug 28 18:03:55 2009 +0200 Improve capability parsing by avoiding regex and try/catch --- VERSION.cmake | 2 +- zypp/Capability.cc | 124 ++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 101 insertions(+), 25 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 3a304f4..bc01d7a 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "11") SET(LIBZYPP_MINOR "13") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") # # LAST RELEASED: 6.13.2 (11) # (The number in parenthesis is LIBZYPP_COMPATMINOR) diff --git a/zypp/Capability.cc b/zypp/Capability.cc index e60187d..0e4f6e3 100644 --- a/zypp/Capability.cc +++ b/zypp/Capability.cc @@ -33,6 +33,104 @@ namespace zypp /////////////////////////////////////////////////////////////////// namespace { ///////////////////////////////////////////////////////////////// + + /** backward skip whitespace starting at pos_r */ + inline std::string::size_type backskipWs( const std::string & str_r, std::string::size_type pos_r ) + { + for ( ; pos_r != std::string::npos; --pos_r ) + { + char ch = str_r[pos_r]; + if ( ch != ' ' && ch != '\t' ) + break; + } + return pos_r; + } + + /** backward skip non-whitespace starting at pos_r */ + inline std::string::size_type backskipNWs( const std::string & str_r, std::string::size_type pos_r ) + { + for ( ; pos_r != std::string::npos; --pos_r ) + { + char ch = str_r[pos_r]; + if ( ch == ' ' || ch == '\t' ) + break; + } + return pos_r; + } + + /** Split any 'op edition' from str_r */ + void splitOpEdition( std::string & str_r, Rel & op_r, Edition & ed_r ) + { + if ( str_r.empty() ) + return; + std::string::size_type ch( str_r.size()-1 ); + + // check whether the one but last word is a valid Rel: + if ( (ch = backskipWs( str_r, ch )) != std::string::npos ) + { + std::string::size_type ee( ch ); + if ( (ch = backskipNWs( str_r, ch )) != std::string::npos ) + { + std::string::size_type eb( ch ); + if ( (ch = backskipWs( str_r, ch )) != std::string::npos ) + { + std::string::size_type oe( ch ); + ch = backskipNWs( str_r, ch ); // now before 'op'? begin + if ( op_r.parseFrom( str_r.substr( ch+1, oe-ch ) ) ) + { + // found a legal 'op' + ed_r = Edition( str_r.substr( eb+1, ee-eb ) ); + if ( ch != std::string::npos ) // 'op' is not at str_r begin, so skip WS + ch = backskipWs( str_r, ch ); + str_r.erase( ch+1 ); + return; + } + } + } + } + // HERE: Didn't find 'name op edition' + // As a convenience we check for an embeded 'op' (not surounded by WS). + // But just '[<=>]=?|!=' and not inside '()'. + ch = str_r.find_last_of( "<=>)" ); + if ( ch != std::string::npos && str_r[ch] != ')' ) + { + std::string::size_type oe( ch ); + + // do edition first: + ch = str_r.find_first_not_of( " \t", oe+1 ); + if ( ch != std::string::npos ) + ed_r = Edition( str_r.substr( ch ) ); + + // now finish op: + ch = oe-1; + if ( str_r[oe] != '=' ) // '[<>]' + { + op_r = ( str_r[oe] == '<' ) ? Rel::LT : Rel::GT; + } + else + { // '?=' + if ( ch != std::string::npos ) + { + switch ( str_r[ch] ) + { + case '<': --ch; op_r = Rel::LE; break; + case '>': --ch; op_r = Rel::GE; break; + case '!': --ch; op_r = Rel::NE; break; + case '=': --ch; // fall through + default: op_r = Rel::EQ; break; + } + } + } + + // finally name: + if ( ch != std::string::npos ) // 'op' is not at str_r begin, so skip WS + ch = backskipWs( str_r, ch ); + str_r.erase( ch+1 ); + return; + } + // HERE: It's a plain 'name' + } + /** Build \ref Capability from data. No parsing required. */ sat::detail::IdType relFromStr( ::_Pool * pool_r, @@ -118,35 +216,13 @@ namespace zypp const std::string & str_r, const ResKind & kind_r, Capability::CtorFlag flag_r ) { - // strval_r has at least two words which could make 'op edition'? - // improve regex! - static const str::regex rx( "(.*[^ \t])([ \t]+)([^ \t]+)([ \t]+)([^ \t]+)" ); - static str::smatch what; - std::string name( str_r ); Rel op; Edition ed; - if ( flag_r == Capability::UNPARSED - && str_r.find(' ') != std::string::npos - && str::regex_match( str_r, what, rx ) ) + if ( flag_r == Capability::UNPARSED ) { - try - { - Rel cop( what[3] ); - Edition ced( what[5] ); - name = what[1]; - op = cop; - ed = ced; - } - catch ( Exception & excpt ) - { - // So they don't make valid 'op edition' - ZYPP_CAUGHT( excpt ); - DBG << "Trying named relation for: " << str_r << endl; - } + splitOpEdition( name, op, ed ); } - //else - // not a versioned relation if ( arch_r.empty() ) return relFromStr( pool_r, name, op, ed, kind_r ); // parses for name[.arch] -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : changes
by Duncan Mac-Vicar P 28 Aug '09

28 Aug '09

ref: refs/heads/master commit 973ff615dd73edff99a4e00c1fb186cb5800448a Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Aug 28 17:34:44 2009 +0200 changes --- package/libzypp.changes | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 5c13823..8f05d76 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 28 17:33:55 CEST 2009 - dmacvicar(a)suse.de + +- package-manager script: + do not fail if kpackagekit is not installed (bnc #529510) + +------------------------------------------------------------------- Wed Aug 26 15:55:22 CEST 2009 - ma(a)suse.de - Tune CheckAccessDeleted to focus on libraries and executables. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : changes
by Duncan Mac-Vicar P 28 Aug '09

28 Aug '09

ref: refs/heads/ma-misc commit 973ff615dd73edff99a4e00c1fb186cb5800448a Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Aug 28 17:34:44 2009 +0200 changes --- package/libzypp.changes | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 5c13823..8f05d76 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 28 17:33:55 CEST 2009 - dmacvicar(a)suse.de + +- package-manager script: + do not fail if kpackagekit is not installed (bnc #529510) + +------------------------------------------------------------------- Wed Aug 26 15:55:22 CEST 2009 - ma(a)suse.de - Tune CheckAccessDeleted to focus on libraries and executables. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Don't fail if kpackagekit is not installed (bnc #529510)
by Duncan Mac-Vicar P 28 Aug '09

28 Aug '09

ref: refs/heads/master commit d54740b252b804169e065110d95969c52570d92d Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Aug 28 17:32:52 2009 +0200 Don't fail if kpackagekit is not installed (bnc #529510) --- tools/package-manager/package-manager | 41 ++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 8 deletions(-) diff --git a/tools/package-manager/package-manager b/tools/package-manager/package-manager index 863619b..596bf0a 100755 --- a/tools/package-manager/package-manager +++ b/tools/package-manager/package-manager @@ -21,21 +21,47 @@ function mkCmd() { done } +function check_installed() +{ + rpm -q "$1" >/dev/null + return $? +} + +function what_do_we_have() +{ + echo "Zlm: ${HAVE_ZLM}" + echo "openSUSE: ${HAVE_OPENSUSE}" + echo "KPackagekit: ${HAVE_KPACKAGEKIT}" + echo "GPackagekit: ${HAVE_GPACKAGEKIT}" + echo "KDE running: ${KDE_FULL_SESSION}" +} + # check what we have HAVE_ZLM=false -if rpm -q zen-updater >/dev/null; then +check_installed "zen-updater" +if [ "$?" == "0" ] +then HAVE_ZLM=true fi + HAVE_OPENSUSE=false -if rpm -q yast2-packager >/dev/null; then +check_installed "yast2-packager" +if [ $? == 0 ] +then HAVE_OPENSUSE=true fi + HAVE_KPACKAGEKIT=false -if rpm -q kpackagekit >/dev/null; then +check_installed "kpackagekit" +if [ "$?" == "0" ] +then HAVE_KPACKAGEKIT=true fi + HAVE_GPACKAGEKIT=false -if rpm -q gnome-packagekit >/dev/null; then +check_installed "gnome-packagekit" +if [ $? == 0 ] +then HAVE_GPACKAGEKIT=true fi @@ -69,11 +95,9 @@ fi METHOD=yast # determine what we can use -if [[ $HAVE_KPACKAGEKIT && $KDE_FULL_SESSION ]] -then +if $HAVE_KPACKAGEKIT && [ "$KDE_FULL_SESSION" ]; then METHOD=kpackagekit -elif [[ $HAVE_GPACKAGEKIT && "$WINDOWMANAGER" == "/usr/bin/gnome" ]] -then +elif $HAVE_GPACKAGEKIT && [ "$WINDOWMANAGER" == "/usr/bin/gnome" ]; then METHOD=gnome-packagekit else if [ "$STACK" == "zlm" ]; then @@ -83,6 +107,7 @@ else fi fi +echo $METHOD xsu() { # a copy of xdg-su. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : Don't fail if kpackagekit is not installed (bnc #529510)
by Duncan Mac-Vicar P 28 Aug '09

28 Aug '09

ref: refs/heads/ma-misc commit d54740b252b804169e065110d95969c52570d92d Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Aug 28 17:32:52 2009 +0200 Don't fail if kpackagekit is not installed (bnc #529510) --- tools/package-manager/package-manager | 41 ++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 8 deletions(-) diff --git a/tools/package-manager/package-manager b/tools/package-manager/package-manager index 863619b..596bf0a 100755 --- a/tools/package-manager/package-manager +++ b/tools/package-manager/package-manager @@ -21,21 +21,47 @@ function mkCmd() { done } +function check_installed() +{ + rpm -q "$1" >/dev/null + return $? +} + +function what_do_we_have() +{ + echo "Zlm: ${HAVE_ZLM}" + echo "openSUSE: ${HAVE_OPENSUSE}" + echo "KPackagekit: ${HAVE_KPACKAGEKIT}" + echo "GPackagekit: ${HAVE_GPACKAGEKIT}" + echo "KDE running: ${KDE_FULL_SESSION}" +} + # check what we have HAVE_ZLM=false -if rpm -q zen-updater >/dev/null; then +check_installed "zen-updater" +if [ "$?" == "0" ] +then HAVE_ZLM=true fi + HAVE_OPENSUSE=false -if rpm -q yast2-packager >/dev/null; then +check_installed "yast2-packager" +if [ $? == 0 ] +then HAVE_OPENSUSE=true fi + HAVE_KPACKAGEKIT=false -if rpm -q kpackagekit >/dev/null; then +check_installed "kpackagekit" +if [ "$?" == "0" ] +then HAVE_KPACKAGEKIT=true fi + HAVE_GPACKAGEKIT=false -if rpm -q gnome-packagekit >/dev/null; then +check_installed "gnome-packagekit" +if [ $? == 0 ] +then HAVE_GPACKAGEKIT=true fi @@ -69,11 +95,9 @@ fi METHOD=yast # determine what we can use -if [[ $HAVE_KPACKAGEKIT && $KDE_FULL_SESSION ]] -then +if $HAVE_KPACKAGEKIT && [ "$KDE_FULL_SESSION" ]; then METHOD=kpackagekit -elif [[ $HAVE_GPACKAGEKIT && "$WINDOWMANAGER" == "/usr/bin/gnome" ]] -then +elif $HAVE_GPACKAGEKIT && [ "$WINDOWMANAGER" == "/usr/bin/gnome" ]; then METHOD=gnome-packagekit else if [ "$STACK" == "zlm" ]; then @@ -83,6 +107,7 @@ else fi fi +echo $METHOD xsu() { # a copy of xdg-su. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Provide non-throwing Rel::parseFrom(std::string)
by Michael Andres 28 Aug '09

28 Aug '09

ref: refs/heads/master commit 2688551762d93de3cb352ddd4169d0c9d08ad266 Author: Michael Andres <ma(a)suse.de> Date: Fri Aug 28 16:36:06 2009 +0200 Provide non-throwing Rel::parseFrom(std::string) --- zypp/Rel.cc | 11 +++++++++++ zypp/Rel.h | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/zypp/Rel.cc b/zypp/Rel.cc index 089ca7c..1839c63 100644 --- a/zypp/Rel.cc +++ b/zypp/Rel.cc @@ -86,6 +86,17 @@ namespace zypp : _op( parse( strval_r, default_r ) ) {} + bool Rel::parseFrom( const std::string & strval_r ) + { + std::map<std::string,Rel::for_use_in_switch>::const_iterator it = findStr( strval_r ); + if ( it == _table.end() ) + { + return false; + } + _op = it->second; + return true; + } + /////////////////////////////////////////////////////////////////// // // METHOD NAME : Rel::asString diff --git a/zypp/Rel.h b/zypp/Rel.h index a5ca5f8..1162abe 100644 --- a/zypp/Rel.h +++ b/zypp/Rel.h @@ -87,15 +87,20 @@ namespace zypp * * \throw PARSE if \a strval_r is not legal. * \todo refine exceptions and check throw. - */ + */ explicit Rel( const std::string & strval_r ); /** Ctor from string (non-throwing). * Illegal string values resolve to \c default_r - */ + */ Rel( const std::string & strval_r, const Rel & default_r ); + /** Assign from string IFF it contains a legal value. + * \return Whether \a strval_r contained a legal value. + */ + bool parseFrom( const std::string & strval_r ); + /** Ctor from bits. */ explicit Rel( unsigned bits_r ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : Provide non-throwing Rel::parseFrom(std::string)
by Michael Andres 28 Aug '09

28 Aug '09

ref: refs/heads/ma-misc commit 2688551762d93de3cb352ddd4169d0c9d08ad266 Author: Michael Andres <ma(a)suse.de> Date: Fri Aug 28 16:36:06 2009 +0200 Provide non-throwing Rel::parseFrom(std::string) --- zypp/Rel.cc | 11 +++++++++++ zypp/Rel.h | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/zypp/Rel.cc b/zypp/Rel.cc index 089ca7c..1839c63 100644 --- a/zypp/Rel.cc +++ b/zypp/Rel.cc @@ -86,6 +86,17 @@ namespace zypp : _op( parse( strval_r, default_r ) ) {} + bool Rel::parseFrom( const std::string & strval_r ) + { + std::map<std::string,Rel::for_use_in_switch>::const_iterator it = findStr( strval_r ); + if ( it == _table.end() ) + { + return false; + } + _op = it->second; + return true; + } + /////////////////////////////////////////////////////////////////// // // METHOD NAME : Rel::asString diff --git a/zypp/Rel.h b/zypp/Rel.h index a5ca5f8..1162abe 100644 --- a/zypp/Rel.h +++ b/zypp/Rel.h @@ -87,15 +87,20 @@ namespace zypp * * \throw PARSE if \a strval_r is not legal. * \todo refine exceptions and check throw. - */ + */ explicit Rel( const std::string & strval_r ); /** Ctor from string (non-throwing). * Illegal string values resolve to \c default_r - */ + */ Rel( const std::string & strval_r, const Rel & default_r ); + /** Assign from string IFF it contains a legal value. + * \return Whether \a strval_r contained a legal value. + */ + bool parseFrom( const std::string & strval_r ); + /** Ctor from bits. */ explicit Rel( unsigned bits_r ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0