May 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r9934 - /trunk/libzypp-testsuite/solver/src/deptestomatic.cc
by schubi2＠svn.opensuse.org 02 May '08

02 May '08

Author: schubi2 Date: Fri May 2 12:20:05 2008 New Revision: 9934 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9934&view=rev Log: regarding arch,ver,....; take the right queue after selecting solution Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/dep… ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Fri May 2 12:20:05 2008 @@ -978,7 +978,12 @@ resolver->addExtraRequire(Capability (names[i], string2kind (node->getProp ("kind")))); } } else if (node->equals ("reportproblems")) { - if (resolver->resolvePool() == true + bool success; + if (!solverQueue.empty()) + success = resolver->resolveQueue(solverQueue); + else + success = resolver->resolvePool(); + if (success && node->getProp ("ignoreValidSolution").empty()) { RESULT << "No problems so far" << endl; } @@ -1046,7 +1051,13 @@ RESULT << "Wrong solution number (0-" << solutionCounter << ")" <<endl; } else { // resolve and check it again - if (resolver->resolvePool() == true) { + bool success; + if (!solverQueue.empty()) + success = resolver->resolveQueue(solverQueue); + else + success = resolver->resolvePool(); + + if (success) { RESULT << "No problems so far" << endl; } else { @@ -1080,10 +1091,13 @@ if (package_name.empty()) package_name = node->getProp ("package"); string kind_name = node->getProp ("kind"); + string version = node->getProp ("ver"); + string release = node->getProp ("rel"); + string architecture = node->getProp ("arch"); PoolItem poolItem; - poolItem = get_poolItem (source_alias, package_name, kind_name); + poolItem = get_poolItem (source_alias, package_name, kind_name, version, release, architecture ); if (poolItem) { RESULT << "Locking " << package_name << " from channel " << source_alias << endl; poolItem.status().setLock (true, ResStatus::USER); @@ -1096,13 +1110,20 @@ if (package_name.empty()) package_name = node->getProp ("package"); string kind_name = node->getProp ("kind"); + string version = node->getProp ("ver"); + string release = node->getProp ("rel"); + string architecture = node->getProp ("arch"); // Solving is needed - resolver->resolvePool(); + bool success; + if (!solverQueue.empty()) + success = resolver->resolveQueue(solverQueue); + else + success = resolver->resolvePool(); if (!package_name.empty()) { PoolItem poolItem; - poolItem = get_poolItem (source_alias, package_name, kind_name); + poolItem = get_poolItem (source_alias, package_name, kind_name, version, release, architecture ); if (poolItem) { if (poolItem.isSatisfied()) RESULT << package_name << " from channel " << source_alias << " IS SATISFIED" << 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] r9933 - /trunk/libzypp/package/libzypp.changes
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 12:16:46 2008 New Revision: 9933 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9933&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes 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 May 2 12:16:46 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri May 2 12:19:22 CEST 2008 - jreidinger(a)suse.cz + +- add isLocal function to Url which say if scheme is local or + internet. +- r9932 + +------------------------------------------------------------------- Fri May 2 09:36:18 CEST 2008 - jreidinger(a)suse.cz - cache decision for repository depend on his 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] r9932 - in /trunk/libzypp: VERSION.cmake zypp/RepoInfo.cc zypp/Url.cc zypp/Url.h zypp/url/UrlBase.cc zypp/url/UrlBase.h
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 12:15:28 2008 New Revision: 9932 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9932&view=rev Log: add isLocal function to Url which say if scheme is local or internet. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/Url.cc trunk/libzypp/zypp/Url.h trunk/libzypp/zypp/url/UrlBase.cc trunk/libzypp/zypp/url/UrlBase.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=9932&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri May 2 12:15:28 2008 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "4") -SET(LIBZYPP_MINOR "18") +SET(LIBZYPP_MINOR "19") SET(LIBZYPP_COMPATMINOR "18") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "0") Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=993… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Fri May 2 12:15:28 2008 @@ -148,11 +148,10 @@ { if ( _pimpl->baseUrls.size()==0 ) //first url { - string scheme = url.getScheme(); - if ( scheme == "http" || scheme == "ftp" || scheme == "smb" ) - setKeepPackages(true); - else + if ( url.isLocal() ) setKeepPackages(false); + else + setKeepPackages(true); } _pimpl->baseUrls.insert(url); Modified: trunk/libzypp/zypp/Url.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Url.cc?rev=9932&r1=… ============================================================================== --- trunk/libzypp/zypp/Url.cc (original) +++ trunk/libzypp/zypp/Url.cc Fri May 2 12:15:28 2008 @@ -445,6 +445,12 @@ return m_impl->isValid(); } + // ----------------------------------------------------------------- + bool + Url::isLocal() const + { + return m_impl->isLocal(); + } // ----------------------------------------------------------------- std::string Modified: trunk/libzypp/zypp/Url.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Url.h?rev=9932&r1=9… ============================================================================== --- trunk/libzypp/zypp/Url.h (original) +++ trunk/libzypp/zypp/Url.h Fri May 2 12:15:28 2008 @@ -259,6 +259,17 @@ bool isValid() const; + /** + * \brief Gets if url uses local network or pc scheme. + * + * Looks if url use local network scheme or uses internet + * scheme like http, ftp, smb. + * + * \return True if url uses local network or pc scheme + */ + bool + isLocal() const; + // ----------------- /** Modified: trunk/libzypp/zypp/url/UrlBase.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/url/UrlBase.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/url/UrlBase.cc (original) +++ trunk/libzypp/zypp/url/UrlBase.cc Fri May 2 12:15:28 2008 @@ -22,6 +22,7 @@ #include <arpa/inet.h> #include <iostream> +#include <set> // in the Estonian locale, a-z excludes t, for example. #302525 // http://en.wikipedia.org/wiki/Estonian_alphabet @@ -428,6 +429,30 @@ return true; } + // --------------------------------------------------------------- + bool + UrlBase::isLocal() const + { + static std::set<std::string> remote; + if (remote.empty()) //fill set + { + remote.insert("http"); + remote.insert("ftp"); + remote.insert("smb"); + remote.insert("ldap"); + remote.insert("ldaps"); + remote.insert("https"); + remote.insert("sftp"); + remote.insert("cifs"); + } + + if ( remote.find(getScheme())!=remote.end() ) + { + return false; + } + + return true; + } // --------------------------------------------------------------- std::string Modified: trunk/libzypp/zypp/url/UrlBase.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/url/UrlBase.h?rev=9… ============================================================================== --- trunk/libzypp/zypp/url/UrlBase.h (original) +++ trunk/libzypp/zypp/url/UrlBase.h Fri May 2 12:15:28 2008 @@ -400,6 +400,16 @@ virtual bool isValid() const; + /** + * \brief Gets if url uses local network or pc scheme. + * + * Looks if url use local network scheme or uses internet + * scheme like http, ftp, smb. + * + * \return True if url uses local network or pc scheme + */ + virtual bool + isLocal() const; // ----------------- /** -- 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] r9931 - /trunk/zypper/doc/zypper.8
by mvidner＠svn.opensuse.org 02 May '08

02 May '08

Author: mvidner Date: Fri May 2 10:56:42 2008 New Revision: 9931 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9931&view=rev Log: there is no zmart Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=9931&r1=… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Fri May 2 10:56:42 2008 @@ -643,7 +643,12 @@ .SH "EXIT CODES" .LP -There are several exit codes defined for zypper for use e.g. within scripts. These codes are defined in header file src/zmart.h found in zypper source package. Codes from interval (1-5) denote an error, numbers (100-103) provide a specific information, 0 represents a normal successfull run. Following is a list of these codes with descriptions. +There are several exit codes defined for zypper for use e.g. within +scripts. These codes are defined in header file src/zypper-main.h +found in zypper source package. Codes from interval (1-5) denote an +error, numbers (100-105) provide a specific information, 0 +represents a normal successful run. Following is a list of these +codes with descriptions. .TP 0 - ZYPPER_EXIT_OK Successfull run of zypper with no special info. -- 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] r9930 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 09:37:22 2008 New Revision: 9930 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9930&view=rev Log: changes Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=9930&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri May 2 09:37:22 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "18") SET(LIBZYPP_COMPATMINOR "18") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") 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 May 2 09:37:22 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri May 2 09:36:18 CEST 2008 - jreidinger(a)suse.cz + +- cache decision for repository depend on his url. +- http,ftp and smb cache packages. +- revision 9929 + +------------------------------------------------------------------- Thu May 1 00:50:51 CEST 2008 - ma(a)suse.de - Load and maintain persistent hard locks stored in /etc/zypp/locks. -- 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] r9929 - in /trunk/libzypp: tests/zypp/RepoManager_test.cc zypp/RepoInfo.cc zypp/RepoInfo.h
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 09:32:24 2008 New Revision: 9929 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9929&view=rev Log: cache decision for repository depend on his url. http,ftp and smb cache packages. Modified: trunk/libzypp/tests/zypp/RepoManager_test.cc trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h Modified: trunk/libzypp/tests/zypp/RepoManager_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/RepoManager_t… ============================================================================== --- trunk/libzypp/tests/zypp/RepoManager_test.cc (original) +++ trunk/libzypp/tests/zypp/RepoManager_test.cc Fri May 2 09:32:24 2008 @@ -137,3 +137,18 @@ manager.buildCache(repo); } +BOOST_AUTO_TEST_CASE(repo_seting_test) +{ + RepoInfo repo; + repo.setAlias("foo"); + repo.addBaseUrl(string("http://test.org")); + BOOST_CHECK_MESSAGE( repo.keepPackages(), "http scheme is not cached"); + repo.setBaseUrl(string("ftp://test.org")); + BOOST_CHECK_MESSAGE( repo.keepPackages(), "ftp scheme is not cached"); + repo.setBaseUrl(string("smb://test.org")); + BOOST_CHECK_MESSAGE( repo.keepPackages(), "smb scheme is not cached"); + repo.setBaseUrl(string("file:///test.txt")); + BOOST_CHECK_MESSAGE( !repo.keepPackages(), "file scheme is cached"); + repo.setBaseUrl(string("http://test.org")); + BOOST_CHECK_MESSAGE( repo.keepPackages(), "cache is depend on second url."); +} Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=992… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Fri May 2 09:32:24 2008 @@ -146,6 +146,15 @@ RepoInfo & RepoInfo::addBaseUrl( const Url &url ) { + if ( _pimpl->baseUrls.size()==0 ) //first url + { + string scheme = url.getScheme(); + if ( scheme == "http" || scheme == "ftp" || scheme == "smb" ) + setKeepPackages(true); + else + setKeepPackages(false); + } + _pimpl->baseUrls.insert(url); return *this; } Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=9929… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Fri May 2 09:32:24 2008 @@ -242,6 +242,7 @@ /** * Add a base url. \see baseUrls * \param url The base url for the repository. + * \note can change keepPackages,so change it after this call * * To recreate the base URLs list, use \ref setBaseUrl(const Url &) followed * by addBaseUrl(). @@ -250,6 +251,7 @@ /** * Clears current base URL list and adds \a url. + * \note can change keepPackages,so change it after this call */ RepoInfo & setBaseUrl( const Url &url ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0