[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

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&r1=9931&r2=9932&view=diff ============================================================================== --- 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=9932&r1=9931&r2=9932&view=diff ============================================================================== --- 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=9931&r2=9932&view=diff ============================================================================== --- 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=9931&r2=9932&view=diff ============================================================================== --- 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=9932&r1=9931&r2=9932&view=diff ============================================================================== --- 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 #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::setstd::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=9932&r1=9931&r2=9932&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org