September 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11187 - in /trunk/libzypp/zypp/media: CredentialManager.cc CredentialManager.h MediaCurl.cc
by jkupec＠svn.opensuse.org 27 Sep '08

27 Sep '08

Author: jkupec Date: Sat Sep 27 23:35:42 2008 New Revision: 11187 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11187&view=rev Log: - fixed endless loop when CM returns bad password - CM now correctly updates password of existing credentials Modified: trunk/libzypp/zypp/media/CredentialManager.cc trunk/libzypp/zypp/media/CredentialManager.h trunk/libzypp/zypp/media/MediaCurl.cc Modified: trunk/libzypp/zypp/media/CredentialManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/CredentialMan… ============================================================================== --- trunk/libzypp/zypp/media/CredentialManager.cc (original) +++ trunk/libzypp/zypp/media/CredentialManager.cc Sat Sep 27 23:35:42 2008 @@ -299,8 +299,15 @@ { AuthData_Ptr c_ptr; c_ptr.reset(new AuthData(cred)); // FIX for child classes if needed - if (_pimpl->_credsGlobal.insert(c_ptr).second) + pair<CredentialIterator, bool> ret = _pimpl->_credsGlobal.insert(c_ptr); + if (ret.second) _pimpl->_globalDirty = true; + else if ((*ret.first)->password() != cred.password()) + { + _pimpl->_credsGlobal.erase(ret.first); + _pimpl->_credsGlobal.insert(c_ptr); + _pimpl->_globalDirty = true; + } } @@ -308,8 +315,15 @@ { AuthData_Ptr c_ptr; c_ptr.reset(new AuthData(cred)); // FIX for child classes if needed - if (_pimpl->_credsUser.insert(c_ptr).second) + pair<CredentialIterator, bool> ret = _pimpl->_credsUser.insert(c_ptr); + if (ret.second) _pimpl->_userDirty = true; + else if ((*ret.first)->password() != cred.password()) + { + _pimpl->_credsUser.erase(ret.first); + _pimpl->_credsUser.insert(c_ptr); + _pimpl->_userDirty = true; + } } Modified: trunk/libzypp/zypp/media/CredentialManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/CredentialMan… ============================================================================== --- trunk/libzypp/zypp/media/CredentialManager.h (original) +++ trunk/libzypp/zypp/media/CredentialManager.h Sat Sep 27 23:35:42 2008 @@ -51,8 +51,6 @@ { if (lhs->username() < rhs->username()) return true; - if (lhs->password() < rhs->password()) - return true; if (lhs->url() != rhs->url()) return true; return false; Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Sat Sep 27 23:35:42 2008 @@ -1591,7 +1591,7 @@ // get stored credentials AuthData_Ptr cmcred = cm.getCred(_url); - if (cmcred) + if (cmcred && firstTry) { credentials.reset(new CurlAuthData(*cmcred)); DBG << "got stored credentials:" << endl << *credentials << endl; @@ -1599,6 +1599,9 @@ // if not found, ask user else { + // reset credentials from CM (they're wrong, obviously) + cmcred.reset(); + CurlAuthData_Ptr curlcred; curlcred.reset(new CurlAuthData()); callback::SendReport<AuthenticationReport> auth_report; @@ -1607,12 +1610,9 @@ if (!_url.getUsername().empty() && firstTry) curlcred->setUsername(_url.getUsername()); - string prompt_msg; - if (!firstTry) - prompt_msg = _("Invalid user name or password."); - else // first prompt - prompt_msg = boost::str(boost::format( - _("Authentication required for '%s'")) % _url.asString()); + string prompt_msg = boost::str(boost::format( + //!\todo add comma to the message for the next release + _("Authentication required for '%s'")) % _url.asString()); // set available authentication types from the exception // might be needed in prompt -- 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] r11186 - /trunk/sat-solver/bindings/python/CMakeLists.txt
by kkaempf＠svn.opensuse.org 26 Sep '08

26 Sep '08

Author: kkaempf Date: Fri Sep 26 16:54:10 2008 New Revision: 11186 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11186&view=rev Log: fix install dir (still unclear reason) Modified: trunk/sat-solver/bindings/python/CMakeLists.txt Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMake… ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Fri Sep 26 16:54:10 2008 @@ -16,7 +16,7 @@ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR) IF (NOT PYTHON_SITEDIR) -SET (PYTHON_SITEDIR ${PYTHON_LIB_DIR}/site-packages) + SET (PYTHON_SITEDIR ${PYTHON_LIB_DIR}) ENDIF (NOT PYTHON_SITEDIR) MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") -- 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] r11185 - in /trunk/libzypp: package/libzypp.changes zypp/media/CredentialManager.h zypp/media/MediaCurl.cc zypp/media/MediaUserAuth.h
by jkupec＠svn.opensuse.org 26 Sep '08

26 Sep '08

Author: jkupec Date: Fri Sep 26 16:21:00 2008 New Revision: 11185 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11185&view=rev Log: - comments - fixed setUserName() name to be consistent with getter Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/media/CredentialManager.h trunk/libzypp/zypp/media/MediaCurl.cc trunk/libzypp/zypp/media/MediaUserAuth.h Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Sep 26 16:21:00 2008 @@ -8,6 +8,12 @@ - version 5.13.0 (13) ------------------------------------------------------------------- +Fri Sep 26 15:25:33 CEST 2008 - jkupec(a)suse.cz + +- save user credentials after asking for them +- revision 11181 + +------------------------------------------------------------------- Thu Sep 25 23:19:55 CEST 2008 - jkupec(a)suse.cz - ZConfig::credentialsGlobal{File,Dir}() added Modified: trunk/libzypp/zypp/media/CredentialManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/CredentialMan… ============================================================================== --- trunk/libzypp/zypp/media/CredentialManager.h (original) +++ trunk/libzypp/zypp/media/CredentialManager.h Fri Sep 26 16:21:00 2008 @@ -111,6 +111,17 @@ /** * Add new credentials with user callbacks. + * + * If the cred->url() contains 'credentials' query parameter, the + * credentials will be automatically saved to the specified file using the + * \ref saveInFile() method. + * + * Otherwise a callback will be called asking whether to save to custom + * file, or to global or user's credentials catalog. + * + * \todo Currently no callback is called, credentials are automatically + * saved to user's credentials.cat if no 'credentials' parameter + * has been specified */ void addCred(const AuthData & cred); Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Fri Sep 26 16:21:00 2008 @@ -1605,10 +1605,10 @@ // preset the username if present in current url if (!_url.getUsername().empty() && firstTry) - curlcred->setUserName(_url.getUsername()); + curlcred->setUsername(_url.getUsername()); string prompt_msg; - if (!firstTry || !_url.getUsername().empty()) + if (!firstTry) prompt_msg = _("Invalid user name or password."); else // first prompt prompt_msg = boost::str(boost::format( @@ -1625,7 +1625,18 @@ << "CurlAuthData: " << *curlcred << endl; if (curlcred->valid()) + { credentials = curlcred; + // if (credentials->username() != _url.getUsername()) + // _url.setUsername(credentials->username()); + /** + * \todo find a way to save the url with changed username + * back to repoinfo or dont store urls with username + * (and either forbid more repos with the same url and different + * user, or return a set of credentials from CM and try them one + * by one) + */ + } } else { Modified: trunk/libzypp/zypp/media/MediaUserAuth.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaUserAuth… ============================================================================== --- trunk/libzypp/zypp/media/MediaUserAuth.h (original) +++ trunk/libzypp/zypp/media/MediaUserAuth.h Fri Sep 26 16:21:00 2008 @@ -14,6 +14,8 @@ #include <curl/curl.h> +#include "zypp/base/Deprecated.h" + #include "zypp/Url.h" #include "zypp/base/PtrTypes.h" @@ -49,7 +51,9 @@ virtual bool valid() const; void setUrl(const Url & url) { _url = url; } - void setUserName(const std::string & username) { _username = username; } + void setUsername(const std::string & username) { _username = username; } + /** \deprecated use setUsername() instead */ + ZYPP_DEPRECATED void setUserName(const std::string & username) { _username = username; } void setPassword(const std::string & password) { _password = password; } Url url() const { return _url; } -- 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] r11184 - in /trunk/sat-solver/bindings: dataiterator.i python/tests/search.py repo.i
by kkaempf＠svn.opensuse.org 26 Sep '08

26 Sep '08

Author: kkaempf Date: Fri Sep 26 15:52:19 2008 New Revision: 11184 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11184&view=rev Log: allow to limit repo.search to Solvable or Keyname Modified: trunk/sat-solver/bindings/dataiterator.i trunk/sat-solver/bindings/python/tests/search.py trunk/sat-solver/bindings/repo.i Modified: trunk/sat-solver/bindings/dataiterator.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dataiterator… ============================================================================== --- trunk/sat-solver/bindings/dataiterator.i (original) +++ trunk/sat-solver/bindings/dataiterator.i Fri Sep 26 15:52:19 2008 @@ -30,12 +30,12 @@ * Complete Dataiterator constructor, to be used via %python in Swig */ - Dataiterator(Repo *repo, const char *match, int option, XSolvable *xs = 0, XRepokey *key = 0) + Dataiterator(Repo *repo, const char *match, int option, XSolvable *xs = 0, const char *keyname = 0) { Dataiterator *di = calloc(1, sizeof( Dataiterator )); Solvable *s = 0; if (xs) s = xsolvable_solvable(xs); - dataiterator_init(di, repo, s ? s - repo->pool->solvables : 0, key ? xrepokey_repokey(key)->name : 0, match, option); + dataiterator_init(di, repo, s ? s - repo->pool->solvables : 0, keyname ? str2id(repo->pool, keyname, 0) : 0, match, option); return di; } Modified: trunk/sat-solver/bindings/python/tests/search.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/search.py (original) +++ trunk/sat-solver/bindings/python/tests/search.py Fri Sep 26 15:52:19 2008 @@ -32,7 +32,7 @@ repo = pool.add_solv( "os11-biarch.solv" ) repo.set_name("test") i = 0 - for d in repo.search("/usr/bin/python", satsolver.SEARCH_STRING|satsolver.SEARCH_FILES): + for d in repo.search("/usr/bin/python", satsolver.SEARCH_STRING|satsolver.SEARCH_FILES, None, "solvable:filelist"): print d.solvable(), "matches '/usr/bin/python' in ", d.keyname(), ": ", d.value() i = i + 1 if i > 10: Modified: trunk/sat-solver/bindings/repo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repo.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/repo.i (original) +++ trunk/sat-solver/bindings/repo.i Fri Sep 26 15:52:19 2008 @@ -162,8 +162,8 @@ */ #if defined(SWIGPYTHON) %pythoncode %{ - def search(self, match, flags): - d = Dataiterator(self,match,flags) + def search(self, match, flags, solvable = None, keyname = None): + d = Dataiterator(self,match,flags, solvable, keyname) while d.step(): yield d %} -- 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] r11183 - /trunk/libzypp/zypp/Product.cc
by mlandres＠svn.opensuse.org 26 Sep '08

26 Sep '08

Author: mlandres Date: Fri Sep 26 15:45:57 2008 New Revision: 11183 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11183&view=rev Log: fix Modified: trunk/libzypp/zypp/Product.cc Modified: trunk/libzypp/zypp/Product.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.cc?rev=1118… ============================================================================== --- trunk/libzypp/zypp/Product.cc (original) +++ trunk/libzypp/zypp/Product.cc Fri Sep 26 15:45:57 2008 @@ -144,7 +144,7 @@ Capabilities provides( it->provides() ); for_( cap, provides.begin(), provides.end() ) { - std::string capstr( cap.asString() ); + std::string capstr( cap->asString() ); if ( str::hasPrefix( capstr, "flavor(" ) ) { capstr = str::stripPrefix( capstr, "flavor(" ); -- 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] r11182 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/NewPool.cc package/libzypp.changes zypp/Product.cc zypp/Product.h zypp/sat/SolvAttr.cc zypp/sat/SolvAttr.h
by mlandres＠svn.opensuse.org 26 Sep '08

26 Sep '08

Author: mlandres Date: Fri Sep 26 15:39:39 2008 New Revision: 11182 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11182&view=rev Log: - Fix computation of Product::flavor. - Add Product::productLine. A vendor specific string denoting the product line. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Product.cc trunk/libzypp/zypp/Product.h trunk/libzypp/zypp/sat/SolvAttr.cc trunk/libzypp/zypp/sat/SolvAttr.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11182&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Sep 26 15:39:39 2008 @@ -63,6 +63,6 @@ SET(LIBZYPP_MINOR "13") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.12.0 (12) +# LAST RELEASED: 5.13.0 (13) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Fri Sep 26 15:39:39 2008 @@ -443,6 +443,23 @@ INT << "===[START]==========================================" << endl; ZConfig::instance(); + { + Capability cap("flavor(dvd9)"); + DBG << cap.detail().isSimple() << endl; + DBG << cap.detail().isNamed() << endl; + DBG << cap.detail().name() << endl; + std::string capstr = str::stripPrefix( cap.asString(), "flavor(" ); + DBG << capstr << endl; + capstr.erase(capstr.size()-1); + DBG << capstr << endl; + } + + + /////////////////////////////////////////////////////////////////// + INT << "===[END]============================================" << endl << endl; + zypp::base::LogControl::instance().logNothing(); + return 0; + #if 0 RepoManager repoManager( makeRepoManager( sysRoot ) ); @@ -504,7 +521,6 @@ getZYpp()->target()->load(); USR << getZYpp()->target()->targetDistribution() << endl; USR << getZYpp()->target()->targetDistributionRelease() << endl; - USR << getZYpp()->target()->targetDistributionFlavor() << endl; } } @@ -616,10 +632,10 @@ PoolItem pi ( getPi<Package>("amarok") ); MIL << pi << endl; - MIL << pi->as<Package>() << endl; - MIL << pi->as<Product>() << endl; + MIL << pi->asKind<Package>() << endl; + MIL << pi->asKind<Product>() << endl; if ( pi->isKind<Package>() ) - SEC << pi->as<Package>() << endl; + SEC << pi->asKind<Package>() << endl; ////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Sep 26 15:39:39 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Sep 26 15:37:50 CEST 2008 - ma(a)suse.de + +- Fix computation of Product::flavor. +- Add Product::productLine. A vendor specific string denoting the + product line. +- revision 11182 +- version 5.13.0 (13) + +------------------------------------------------------------------- Thu Sep 25 23:19:55 CEST 2008 - jkupec(a)suse.cz - ZConfig::credentialsGlobal{File,Dir}() added Modified: trunk/libzypp/zypp/Product.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.cc?rev=1118… ============================================================================== --- trunk/libzypp/zypp/Product.cc (original) +++ trunk/libzypp/zypp/Product.cc Fri Sep 26 15:39:39 2008 @@ -114,17 +114,48 @@ if ( (*it).buddy().isKind( ResKind::product ) ) ret.push_back( make<Product>( (*it).buddy() ) ); } - return ret; } + std::string Product::productLine() const + { +#warning productLine needs to be implemented. + return std::string(); + } + /////////////////////////////////////////////////////////////////// std::string Product::shortName() const { return lookupStrAttribute( sat::SolvAttr::productShortlabel ); } std::string Product::flavor() const - { return lookupStrAttribute( sat::SolvAttr::productFlavor ); } + { + // Look for a provider of 'product_flavor(name) = version' + // within the same repo. Unlike the reference package, we + // can be relaxed and ignore the architecture. + Capability identCap( str::form( "product_flavor(%s) = %s", name().c_str(), edition().c_str() ) ); + + sat::WhatProvides providers( identCap ); + for_( it, providers.begin(), providers.end() ) + { + if ( it->repository() == repository() ) + { + // Got the package now try to get the provided 'flavor(...)' + Capabilities provides( it->provides() ); + for_( cap, provides.begin(), provides.end() ) + { + std::string capstr( cap.asString() ); + if ( str::hasPrefix( capstr, "flavor(" ) ) + { + capstr = str::stripPrefix( capstr, "flavor(" ); + capstr.erase( capstr.size()-1 ); // trailing ')' + return capstr; + } + } + } + } + return std::string(); + } std::string Product::type() const { return lookupStrAttribute( sat::SolvAttr::productType ); } @@ -162,7 +193,6 @@ /* safety checks, shouldn't happen (tm) */ if (url_type_it == url_type.end()) { - /* FIXME: Raise exception ?! */ ERR << *this << " : The thing that should not happen, happened." << endl; break; } Modified: trunk/libzypp/zypp/Product.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.h?rev=11182… ============================================================================== --- trunk/libzypp/zypp/Product.h (original) +++ trunk/libzypp/zypp/Product.h Fri Sep 26 15:39:39 2008 @@ -52,6 +52,9 @@ */ ReplacedProducts replacedProducts() const; + /** Vendor specific string denoting the product line. */ + std::string productLine() const; + public: /** Untranslated short name like <tt>SLES 10</tt>*/ std::string shortName() const; Modified: trunk/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev… ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.cc (original) +++ trunk/libzypp/zypp/sat/SolvAttr.cc Fri Sep 26 15:39:39 2008 @@ -103,19 +103,18 @@ const SolvAttr SolvAttr::productDistversion ( PRODUCT_DISTVERSION ); const SolvAttr SolvAttr::productType ( PRODUCT_TYPE ); const SolvAttr SolvAttr::productFlags ( PRODUCT_FLAGS ); - const SolvAttr SolvAttr::productFlavor ( PRODUCT_FLAVOR ); const SolvAttr SolvAttr::productUpdaterepoKey ( PRODUCT_UPDATEREPOKEY ); const SolvAttr SolvAttr::productRegisterTarget ( PRODUCT_REGISTER_TARGET ); const SolvAttr SolvAttr::productRegisterRelease( PRODUCT_REGISTER_RELEASE ); - const SolvAttr SolvAttr::productUrl( PRODUCT_URL ); - const SolvAttr SolvAttr::productUrlType( PRODUCT_URL_TYPE ); + const SolvAttr SolvAttr::productUrl ( PRODUCT_URL ); + const SolvAttr SolvAttr::productUrlType ( PRODUCT_URL_TYPE ); // repository const SolvAttr SolvAttr::repositoryTimestamp ( REPOSITORY_TIMESTAMP ); - const SolvAttr SolvAttr::repositoryExpire ( REPOSITORY_EXPIRE ); - const SolvAttr SolvAttr::repositoryUpdates ( REPOSITORY_UPDATES ); - const SolvAttr SolvAttr::repositoryProducts ( REPOSITORY_PRODUCTS ); - const SolvAttr SolvAttr::repositoryKeywords ( REPOSITORY_KEYWORDS ); + const SolvAttr SolvAttr::repositoryExpire ( REPOSITORY_EXPIRE ); + const SolvAttr SolvAttr::repositoryUpdates ( REPOSITORY_UPDATES ); + const SolvAttr SolvAttr::repositoryProducts ( REPOSITORY_PRODUCTS ); + const SolvAttr SolvAttr::repositoryKeywords ( REPOSITORY_KEYWORDS ); } // namespace sat ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.h?rev=… ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.h (original) +++ trunk/libzypp/zypp/sat/SolvAttr.h Fri Sep 26 15:39:39 2008 @@ -128,7 +128,6 @@ static const SolvAttr productDistversion; static const SolvAttr productType; static const SolvAttr productFlags; - static const SolvAttr productFlavor; static const SolvAttr productUpdaterepoKey; static const SolvAttr productRegisterTarget; static const SolvAttr productRegisterRelease; -- 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] r11181 - in /trunk/libzypp/zypp/media: CredentialManager.cc MediaCurl.cc
by jkupec＠svn.opensuse.org 26 Sep '08

26 Sep '08

Author: jkupec Date: Fri Sep 26 15:25:03 2008 New Revision: 11181 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11181&view=rev Log: - save credentials after asking for them - todo: ask user _where_ to store them. Automatically saving to user's credentials.cat for now Modified: trunk/libzypp/zypp/media/CredentialManager.cc trunk/libzypp/zypp/media/MediaCurl.cc Modified: trunk/libzypp/zypp/media/CredentialManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/CredentialMan… ============================================================================== --- trunk/libzypp/zypp/media/CredentialManager.cc (original) +++ trunk/libzypp/zypp/media/CredentialManager.cc Fri Sep 26 15:25:03 2008 @@ -286,8 +286,12 @@ void CredentialManager::addCred(const AuthData & cred) { -#warning addCred(const AuthData & cred) not implemented - // add with user callbacks + Pathname credfile = cred.url().getQueryParam("credentials"); + if (credfile.empty()) + //! \todo ask user where to store these creds. saving to user creds for now + addUserCred(cred); + else + saveInFile(cred, credfile); } @@ -338,6 +342,7 @@ { AuthData_Ptr c_ptr; c_ptr.reset(new AuthData(cred)); // FIX for child classes if needed + c_ptr->setUrl(Url()); // don't save url in custom creds file CredentialManager::CredentialSet creds; creds.insert(c_ptr); Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Fri Sep 26 15:25:03 2008 @@ -1653,6 +1653,13 @@ if ( ret != 0 ) ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); } + if (!cmcred) + { + credentials->setUrl(_url); + cm.addCred(*credentials); + cm.save(); + } + return true; } -- 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] r11180 - /trunk/libzypp/libzypp.spec.cmake
by dmacvicar＠svn.opensuse.org 26 Sep '08

26 Sep '08

Author: dmacvicar Date: Fri Sep 26 14:28:06 2008 New Revision: 11180 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11180&view=rev Log: fix build Modified: trunk/libzypp/libzypp.spec.cmake Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=1… ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Fri Sep 26 14:28:06 2008 @@ -213,7 +213,6 @@ %dir %{_var}/lib/zypp %dir %{_var}/log/zypp %dir %{_var}/cache/zypp -%{prefix}/lib/zypp %{prefix}/share/zypp %{prefix}/share/applications/package-manager.desktop %{prefix}/share/icons/hicolor/scalable/apps/package-manager-icon.svg -- 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] r11179 - in /trunk/sat-solver: VERSION.cmake package/libsatsolver.changes tools/CMakeLists.txt tools/repo_products.c tools/repo_zyppdb.c tools/repo_zyppdb.h
by kkaempf＠svn.opensuse.org 26 Sep '08

26 Sep '08

Author: kkaempf Date: Fri Sep 26 11:58:08 2008 New Revision: 11179 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11179&view=rev Log: bnc#429177 - new fallback strategy for installed products in rpmdb2solv try /etc/products.d (code11 style) first if this fails, try /var/lib/zypp/db/products/* if this fails, fallback to /etc/*-release - 0.10.16 Added: trunk/sat-solver/tools/repo_zyppdb.c trunk/sat-solver/tools/repo_zyppdb.h Modified: trunk/sat-solver/VERSION.cmake trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/tools/CMakeLists.txt trunk/sat-solver/tools/repo_products.c Modified: trunk/sat-solver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/VERSION.cmake?rev=111… ============================================================================== --- trunk/sat-solver/VERSION.cmake (original) +++ trunk/sat-solver/VERSION.cmake Fri Sep 26 11:58:08 2008 @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "10") -SET(LIBSATSOLVER_PATCH "15") +SET(LIBSATSOLVER_PATCH "16") -# last released 0.10.14 +# last released 0.10.16 Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Sep 26 11:58:08 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri Sep 26 11:54:34 CEST 2008 - kkaempf(a)suse.de + +- new fallback strategy for installed products in rpmdb2solv + try /etc/products.d (code11 style) first + if this fails, try /var/lib/zypp/db/products/* + if this fails, fallback to /etc/*-release + (bnc#429177) +- 0.10.16 + +------------------------------------------------------------------- Thu Sep 25 17:14:42 CEST 2008 - kkaempf(a)suse.de - fully support Dataiterator in Python and Ruby bindings. Modified: trunk/sat-solver/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?… ============================================================================== --- trunk/sat-solver/tools/CMakeLists.txt (original) +++ trunk/sat-solver/tools/CMakeLists.txt Fri Sep 26 11:58:08 2008 @@ -12,6 +12,8 @@ repo_rpmdb.c repo_products.c repo_products.h + repo_zyppdb.c + repo_zyppdb.h repo_write.c common_write.c ) Modified: trunk/sat-solver/tools/repo_products.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_products.c… ============================================================================== --- trunk/sat-solver/tools/repo_products.c (original) +++ trunk/sat-solver/tools/repo_products.c Fri Sep 26 11:58:08 2008 @@ -30,6 +30,7 @@ #define DISABLE_SPLIT #include "tools_util.h" #include "repo_content.h" +#include "repo_zyppdb.h" //#define DUMPOUT 0 @@ -100,7 +101,6 @@ Pool *pool; Repo *repo; Repodata *data; - int datanum; struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; @@ -590,7 +590,6 @@ repo_add_products(Repo *repo, Repodata *repodata, const char *proddir, const char *root, const char *attribute) { const char *fullpath = proddir; - int code11; DIR *dir; int i; struct parsedata pd; @@ -613,27 +612,41 @@ pd.sbtab[sw->to] = sw->from; } - code11 = 1; dir = opendir(fullpath); - if (!dir) + if (dir) { - fullpath = root ? join2(root, "", "/etc") : "/etc"; - dir = opendir(fullpath); - code11 = 0; - } - if (!dir) - { - perror(fullpath); + parse_dir(dir, fullpath, &pd, repodata, 1); /* assume 'code11' products */ + closedir(dir); } else { - parse_dir(dir, fullpath, &pd, repodata, code11); + fullpath = root ? join2(root, "", "/var/lib/zypp/db/products") : "/var/lib/zypp/db/products"; + dir = opendir(fullpath); + if (dir) + { + repo_add_zyppdb_products(repo, repodata, fullpath, dir); /* assume 'code10' zypp-style products */ + closedir(dir); + } + else + { + fullpath = root ? join2(root, "", "/etc") : "/etc"; + dir = opendir(fullpath); + if (dir) + { + parse_dir(dir, fullpath, &pd, repodata, 0); /* fall back to /etc/<xyz>-release parsing */ + closedir(dir); + } + else + { + perror(fullpath); + } + } } - + sat_free((void *)pd.tmplang); free(pd.content); join_freemem(); - closedir(dir); + } /* EOF */ Added: trunk/sat-solver/tools/repo_zyppdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_zyppdb.c?r… ============================================================================== --- trunk/sat-solver/tools/repo_zyppdb.c (added) +++ trunk/sat-solver/tools/repo_zyppdb.c Fri Sep 26 11:58:08 2008 @@ -0,0 +1,394 @@ +/* + * repo_zyppdb.c + * + * Parses /var/lib/zypp/db/products/... + * The are old (pre Code11) products. See bnc#429177 + * + * + * Copyright (c) 2008, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <limits.h> +#include <fcntl.h> +#include <ctype.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <assert.h> +#include <dirent.h> +#include <expat.h> + +#include "pool.h" +#include "repo.h" +#include "util.h" +#define DISABLE_SPLIT +#include "tools_util.h" +#include "repo_content.h" + + +//#define DUMPOUT 0 + +enum state { + STATE_START, // 0 + STATE_PRODUCT, // 1 + STATE_NAME, // 2 + STATE_VERSION, // 3 + STATE_ARCH, // 4 + STATE_SUMMARY, // 5 + STATE_VENDOR, // 6 + STATE_INSTALLTIME, // 7 + NUMSTATES // 0 +}; + +struct stateswitch { + enum state from; + char *ename; + enum state to; + int docontent; +}; + +/* !! must be sorted by first column !! */ +static struct stateswitch stateswitches[] = { + { STATE_START, "product", STATE_PRODUCT, 0 }, + { STATE_PRODUCT, "name", STATE_NAME, 1 }, + { STATE_PRODUCT, "version", STATE_VERSION, 0 }, + { STATE_PRODUCT, "arch", STATE_ARCH, 1 }, + { STATE_PRODUCT, "summary", STATE_SUMMARY, 1 }, + { STATE_PRODUCT, "install-time", STATE_INSTALLTIME, 1 }, + { STATE_PRODUCT, "vendor", STATE_VENDOR, 1 }, + { NUMSTATES } +}; + +struct parsedata { + int depth; + enum state state; + int statedepth; + char *content; + int lcontent; + int acontent; + int docontent; + Pool *pool; + Repo *repo; + Repodata *data; + + struct stateswitch *swtab[NUMSTATES]; + enum state sbtab[NUMSTATES]; + + const char *tmplang; + + Solvable *solvable; + Id handle; + + Id langcache[ID_NUM_INTERNAL]; +}; + + +/* + * find_attr + * find value for xml attribute + * I: txt, name of attribute + * I: atts, list of key/value attributes + * I: dup, strdup it + * O: pointer to value of matching key, or NULL + * + */ + +static inline const char * +find_attr(const char *txt, const char **atts, int dup) +{ + for (; *atts; atts += 2) + { + if (!strcmp(*atts, txt)) + return dup ? strdup(atts[1]) : atts[1]; + } + return 0; +} + + +/* + * create localized tag + */ + +static Id +langtag(struct parsedata *pd, Id tag, const char *language) +{ + if (language && !language[0]) + language = 0; + if (!language || tag >= ID_NUM_INTERNAL) + return pool_id2langid(pd->repo->pool, tag, language, 1); + if (!pd->langcache[tag]) + pd->langcache[tag] = pool_id2langid(pd->repo->pool, tag, language, 1); + return pd->langcache[tag]; +} + + +/* + * XML callback: startElement + */ + +static void XMLCALL +startElement(void *userData, const char *name, const char **atts) +{ + struct parsedata *pd = userData; + Pool *pool = pd->pool; + Solvable *s = pd->solvable; + struct stateswitch *sw; + +#if 0 + fprintf(stderr, "start: [%d]%s\n", pd->state, name); +#endif + if (pd->depth != pd->statedepth) + { + pd->depth++; + return; + } + + pd->depth++; + if (!pd->swtab[pd->state]) /* no statetable -> no substates */ + { +#if 0 + fprintf(stderr, "into unknown: %s (from: %d)\n", name, pd->state); +#endif + return; + } + for (sw = pd->swtab[pd->state]; sw->from == pd->state; sw++) /* find name in statetable */ + if (!strcmp(sw->ename, name)) + break; + + if (sw->from != pd->state) + { +#if 0 + fprintf(stderr, "into unknown: %s (from: %d)\n", name, pd->state); +#endif + return; + } + pd->state = sw->to; + pd->docontent = sw->docontent; + pd->statedepth = pd->depth; + pd->lcontent = 0; + *pd->content = 0; + + switch(pd->state) + { + case STATE_PRODUCT: + { + /* parse 'type' */ + const char *type = find_attr("type", atts, 0); + s = pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo)); + repodata_extend(pd->data, s - pool->solvables); + pd->handle = repodata_get_handle(pd->data, (s - pool->solvables) - pd->repo->start); + if (type) + { + repodata_set_str(pd->data, pd->handle, PRODUCT_TYPE, type); + } + } + break; + case STATE_VERSION: + { + const char *ver = find_attr("ver", atts, 0); + const char *rel = find_attr("rel", atts, 0); + /* const char *epoch = find_attr("epoch", atts, 1); ignored */ + s->evr = makeevr(pd->pool, join2(ver, "-", rel)); + } + break; + /* <summary lang="xy">... */ + case STATE_SUMMARY: + pd->tmplang = find_attr("lang", atts, 1); + break; + default: + break; + } +} + + +static void XMLCALL +endElement(void *userData, const char *name) +{ + struct parsedata *pd = userData; + Solvable *s = pd->solvable; + +#if 0 + fprintf(stderr, "end: [%d]%s\n", pd->state, name); +#endif + if (pd->depth != pd->statedepth) + { + pd->depth--; +#if 0 + fprintf(stderr, "back from unknown %d %d %d\n", pd->state, pd->depth, pd->statedepth); +#endif + return; + } + + pd->depth--; + pd->statedepth--; + + switch (pd->state) + { + case STATE_PRODUCT: + + if (!s->arch) + s->arch = ARCH_NOARCH; + if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) + s->provides = repo_addid_dep(pd->repo, s->provides, rel2id(pd->pool, s->name, s->evr, REL_EQ, 1), 0); + pd->solvable = 0; + break; + case STATE_NAME: + s->name = str2id(pd->pool, join2("product", ":", pd->content), 1); + break; + case STATE_ARCH: + s->arch = str2id(pd->pool, pd->content, 1); + break; + case STATE_SUMMARY: + repodata_set_str(pd->data, pd->handle, langtag(pd, SOLVABLE_SUMMARY, pd->tmplang), pd->content); + pd->tmplang = sat_free((void *)pd->tmplang); + break; + case STATE_VENDOR: + s->vendor = str2id(pd->pool, pd->content, 1); + break; + case STATE_INSTALLTIME: + repodata_set_num(pd->data, pd->handle, SOLVABLE_INSTALLTIME, atol(pd->content)); + default: + break; + } + + pd->state = pd->sbtab[pd->state]; + pd->docontent = 0; + +#if 0 + fprintf(stderr, "end: [%s] -> %d\n", name, pd->state); +#endif +} + + +static void XMLCALL +characterData(void *userData, const XML_Char *s, int len) +{ + struct parsedata *pd = userData; + int l; + char *c; + if (!pd->docontent) { +#if 0 + char *dup = strndup( s, len ); + fprintf(stderr, "Content: [%d]'%s'\n", pd->state, dup ); + free( dup ); +#endif + return; + } + l = pd->lcontent + len + 1; + if (l > pd->acontent) + { + pd->content = realloc(pd->content, l + 256); + pd->acontent = l + 256; + } + c = pd->content + pd->lcontent; + pd->lcontent += len; + while (len-- > 0) + *c++ = *s++; + *c = 0; +} + +#define BUFF_SIZE 8192 + + +/* + * add single product to repo + * + */ + +static void +repo_add_product(struct parsedata *pd, Repodata *data, FILE *fp) +{ + char buf[BUFF_SIZE]; + int l; + + XML_Parser parser = XML_ParserCreate(NULL); + XML_SetUserData(parser, pd); + XML_SetElementHandler(parser, startElement, endElement); + XML_SetCharacterDataHandler(parser, characterData); + + for (;;) + { + l = fread(buf, 1, sizeof(buf), fp); + if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR) + { + fprintf(stderr, "repo_zyppdb: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser)); + exit(1); + } + if (l == 0) + break; + } + XML_ParserFree(parser); + return; +} + + + +/* + * parse dir for products + */ + +static void +parse_dir(DIR *dir, const char *path, struct parsedata *pd, Repodata *repodata) +{ + struct dirent *entry; + + while ((entry = readdir(dir))) + { + int len = strlen(entry->d_name); + if (len < 3) /* skip '.' and '..' */ + continue; + char *fullpath = join2(path, "/", entry->d_name); + FILE *fp = fopen(fullpath, "r"); + if (!fp) + { + perror(fullpath); + break; + } + repo_add_product(pd, repodata, fp); + fclose(fp); + } +} + + +/* + * read all installed products + * + * parse each one as a product + */ + +void +repo_add_zyppdb_products(Repo *repo, Repodata *repodata, const char *fullpath, DIR *dir) +{ + int i; + struct parsedata pd; + struct stateswitch *sw; + + memset(&pd, 0, sizeof(pd)); + pd.repo = repo; + pd.pool = repo->pool; + pd.data = repodata; + + pd.content = malloc(256); + pd.acontent = 256; + + for (i = 0, sw = stateswitches; sw->from != NUMSTATES; i++, sw++) + { + if (!pd.swtab[sw->from]) + pd.swtab[sw->from] = sw; + pd.sbtab[sw->to] = sw->from; + } + + parse_dir(dir, fullpath, &pd, repodata); + + sat_free((void *)pd.tmplang); + free(pd.content); + join_freemem(); +} + +/* EOF */ Added: trunk/sat-solver/tools/repo_zyppdb.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_zyppdb.h?r… ============================================================================== --- trunk/sat-solver/tools/repo_zyppdb.h (added) +++ trunk/sat-solver/tools/repo_zyppdb.h Fri Sep 26 11:58:08 2008 @@ -0,0 +1,8 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + +void repo_add_zyppdb_products(Repo *repo, Repodata *repodata, const char *fullpath, DIR *dir); -- 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] r11178 - /trunk/libzypp/zypp.conf
by jkupec＠svn.opensuse.org 25 Sep '08

25 Sep '08

Author: jkupec Date: Thu Sep 25 23:25:13 2008 New Revision: 11178 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11178&view=rev Log: - copy&paste error Modified: trunk/libzypp/zypp.conf Modified: trunk/libzypp/zypp.conf URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=11178&r1=1… ============================================================================== --- trunk/libzypp/zypp.conf (original) +++ trunk/libzypp/zypp.conf Thu Sep 25 23:25:13 2008 @@ -269,7 +269,7 @@ ## be stored and looked for in a file named <filename> in this directory. ## ## Valid values: absolute path to a directory -## Default value: /var/log/zypp/history +## Default value: /etc/zypp/credentials.d ## # credentials.global.dir = /etc/zypp/credentials.d -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0