July 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10715 - in /trunk/libzypp: package/libzypp.changes zypp/CMakeLists.txt zypp/ProductInfo.cc zypp/ProductInfo.h zypp/ResObject.cc zypp/ResObject.h
by mlandres＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: mlandres Date: Thu Jul 31 22:57:10 2008 New Revision: 10715 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10715&view=rev Log: - New class ProductInfo to provide product related metadata that might be associated with a package. This will replace the Product resolvable. Added: trunk/libzypp/zypp/ProductInfo.cc trunk/libzypp/zypp/ProductInfo.h Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/ResObject.cc trunk/libzypp/zypp/ResObject.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 Thu Jul 31 22:57:10 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jul 31 21:52:11 CEST 2008 ma(a)suse.de + +- New class ProductInfo to provide product related metadata that + might be associated with a package. This will replace the Product + resolvable. +- revision 10715 + +------------------------------------------------------------------- Thu Jul 31 19:01:54 CEST 2008 - dmacvicar(a)suse.de - generate a unique anonymous unique string per target Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Thu Jul 31 22:57:10 2008 @@ -41,6 +41,7 @@ PoolQueryResult.cc ProblemSolution.cc Product.cc + ProductInfo.cc ProgressData.cc ProvideFilePolicy.cc PublicKey.cc @@ -128,6 +129,7 @@ ProblemSolution.h ProblemTypes.h Product.h + ProductInfo.h ProgressData.h ProvideFilePolicy.h PublicKey.h Added: trunk/libzypp/zypp/ProductInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ProductInfo.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/ProductInfo.cc (added) +++ trunk/libzypp/zypp/ProductInfo.cc Thu Jul 31 22:57:10 2008 @@ -0,0 +1,192 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/ProductInfo.cc + * +*/ +#include <iostream> +#include "zypp/base/LogTools.h" + +#include "zypp/ProductInfo.h" +#include "zypp/PoolItem.h" +#include "zypp/Package.h" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + namespace + { + /** Fast check whether a \ref sat::Solvable provides product metadata. + * Return the solvable or \ref sat::noSolvable. + */ + sat::Solvable ifProductInfoProvided( sat::Solvable solvable_r ) + { +#warning THIS SHOULD BE REPLACED BY A FAST TEST E.G. productName + // and use detail::IdType lookupIdAttribute for this test + + if ( solvable_r.lookupStrAttribute( sat::SolvAttr::productShortlabel ).empty() ) + return sat::Solvable::noSolvable; + return solvable_r; + } + + /** List attribute helper */ + void fillList( std::list<Url> & ret_r, sat::Solvable solv_r, sat::SolvAttr attr_r ) + { + sat::LookupAttr query( attr_r, solv_r ); + for_( it, query.begin(), query.end() ) + { + try // ignore malformed urls + { + ret_r.push_back( Url( it.asString() ) ); + } + catch( const url::UrlException & ) + {} + } + } + + /** List attribute helper */ + void fillList( std::list<std::string> & ret_r, sat::Solvable solv_r, sat::SolvAttr attr_r ) + { + sat::LookupAttr query( attr_r, solv_r ); + for_( it, query.begin(), query.end() ) + { + ret_r.push_back( it.asString() ); + } + } + } + + /////////////////////////////////////////////////////////////////// + + const ProductInfo ProductInfo::noProductInfo; + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : ProductInfo::ProductInfo + // METHOD TYPE : Ctor + // + ProductInfo::ProductInfo() + {} + + ProductInfo::ProductInfo( sat::Solvable solvable_r ) + : sat::Solvable( ifProductInfoProvided( solvable_r ) ) + {} + + ProductInfo::ProductInfo( const PoolItem & poolItem_r ) + : sat::Solvable( ifProductInfoProvided( poolItem_r.satSolvable() ) ) + {} + + ProductInfo::ProductInfo( const ResTraits<ResObject>::constPtrType & package_r ) + : sat::Solvable( package_r ? ifProductInfoProvided( package_r->satSolvable() ) + : sat::Solvable::noSolvable ) + {} + + /****************************************************************** + ** + ** FUNCTION NAME : operator<< + ** FUNCTION TYPE : std::ostream & + */ + std::ostream & operator<<( std::ostream & str, const ProductInfo & obj ) + { +#warning provide reasonable output + return str << obj.satSolvable(); + } + + /////////////////////////////////////////////////////////////////// + + PoolItem ProductInfo::poolItem() const + { + return PoolItem( *this ); + } + + ResTraits<Package>::constPtrType ProductInfo::package() const + { + return make<Package>( *this ); + } + + /////////////////////////////////////////////////////////////////// + +#warning DUMMIES RETURNING THE PACKAGE ATTRIBUTES + std::string ProductInfo::name() const + { return sat::Solvable::name(); } + + Edition ProductInfo::edition() const + { return sat::Solvable::edition(); } + + Arch ProductInfo::arch() const + { return sat::Solvable::arch(); } + + Vendor ProductInfo::vendor() const + { return sat::Solvable::vendor().asString(); } + + std::string ProductInfo::summary( const Locale & lang_r ) const + { return package() ? package()->summary( lang_r ) : std::string(); } + + std::string ProductInfo::description( const Locale & lang_r ) const + { return package() ? package()->description( lang_r ) : std::string(); } + + +#warning REVIEW THESE OLD PRODUCT ARTTRIBUTES + + std::string ProductInfo::type() const + { return lookupStrAttribute( sat::SolvAttr::productType ); } + + Url ProductInfo::releaseNotesUrl() const + { + std::list<Url> ret; + fillList( ret, satSolvable(), sat::SolvAttr::productRelnotesurl ); + if ( ! ret.empty() ) + return ret.front(); + return Url(); + } + + std::list<Url> ProductInfo::updateUrls() const + { + std::list<Url> ret; + fillList( ret, satSolvable(), sat::SolvAttr::productUpdateurls ); + return ret; + } + + std::list<Url> ProductInfo::extraUrls() const + { + std::list<Url> ret; + fillList( ret, satSolvable(), sat::SolvAttr::productExtraurls ); + return ret; + } + + std::list<Url> ProductInfo::optionalUrls() const + { + std::list<Url> ret; + fillList( ret, satSolvable(), sat::SolvAttr::productOptionalurls ); + return ret; + } + + std::list<std::string> ProductInfo::flags() const + { + std::list<std::string> ret; + fillList( ret, satSolvable(), sat::SolvAttr::productFlags ); + return ret; + } + + std::string ProductInfo::shortName() const + { return lookupStrAttribute( sat::SolvAttr::productShortlabel ); } + + std::string ProductInfo::longName( const Locale & /*lang_r*/ ) const + { return std::string(); } + + std::string ProductInfo::distributionName() const + { return lookupStrAttribute( sat::SolvAttr::productDistproduct ); } + + Edition ProductInfo::distributionEdition() const + { return Edition( lookupStrAttribute( sat::SolvAttr::productDistversion ) ); } + + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/ProductInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ProductInfo.h?rev=1… ============================================================================== --- trunk/libzypp/zypp/ProductInfo.h (added) +++ trunk/libzypp/zypp/ProductInfo.h Thu Jul 31 22:57:10 2008 @@ -0,0 +1,172 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/ProductInfo.h + * +*/ +#ifndef ZYPP_PRODUCTINFO_H +#define ZYPP_PRODUCTINFO_H + +#include <iosfwd> + +#include "zypp/sat/Solvable.h" +#include "zypp/Locale.h" +#include "zypp/Vendor.h" +#include "zypp/Repository.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + class Url; + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : ProductInfo + // + /** Product metadata. + * + * \ref ProductInfo allows to retrieve product related metadata, that + * might be associated with certain packages. This class basically + * provides the information stored in an \c /etc/products.d entry. + * + * \ref ProductInfo is provided by \ref Package. + * + * The underlying \c private \ref sat::Solvable either refers to + * an associated package providing product related metadata, or + * is \ref sat::noSolvable. + */ + class ProductInfo : private sat::Solvable + { + public: + /** Represents no \ref ProductInfo. */ + static const ProductInfo noProductInfo; + + public: + /** Default ctor creates \ref noProductInfo. */ + ProductInfo(); + + /** ProductInfo associated with a \ref sat::Solvable or \ref noProductInfo. */ + explicit ProductInfo( sat::Solvable solvable_r ); + + /** ProductInfo associated with a \ref PoolItem or \ref noProductInfo. */ + explicit ProductInfo( const PoolItem & poolItem_r ); + + /** ProductInfo associated with a \ref ResObject or \ref noProductInfo. */ + explicit ProductInfo( const ResTraits<ResObject>::constPtrType & package_r ); + + public: +#ifndef SWIG // Swig treats it as syntax error + /** Whether this represents a valid- or \ref noProductInfo. */ + using sat::Solvable::operator bool_type; +#endif + + public: + /** \name Access the associated \ref Package. + */ + //@{ + /** Access the associated \ref sat:::Solvable. */ + sat::Solvable satSolvable() const + { return *this; } + + /** Access the associated \ref PoolItem. */ + PoolItem poolItem() const; + + /** Access the associated \ref Package. */ + ResTraits<Package>::constPtrType package() const; + //@} + + public: + /** \name Product metadata. + */ + //@{ + /** Whether this represents an installed Product. */ + using sat::Solvable::isSystem; + + std::string name() const; + Edition edition() const; + Arch arch() const; + Vendor vendor() const; + + std::string summary( const Locale & lang_r = Locale() ) const; + std::string description( const Locale & lang_r = Locale() ) const; + + /** The \ref Repository this \ref Product belongs to. */ + using sat::Solvable::repository; + + /** \ref RepoInfo associated with the repository + * providing this product. + */ + RepoInfo repoInfo() const { return repository().info(); } + + + //---------------------------------------------- + // These are the old Product attibutes to be revieved: + + /** Get the product type (base, add-on) */ + std::string type() const; + + /** The URL to download the release notes for this product */ + Url releaseNotesUrl() const; + + /** + * Online updates for the product. + * They are complementary, not alternatives. #163192 + */ + std::list<Url> updateUrls() const; + + /** + * Additional software for the product + * They are complementary, not alternatives. + */ + std::list<Url> extraUrls() const; + + /** + * Optional software for the product + * (for example. Non OSS repositories) + * They are complementary, not alternatives. + */ + std::list<Url> optionalUrls() const; + + /** The product flags */ + std::list<std::string> flags() const; + + /** Untranslated short name like <tt>SLES 10</tt>*/ + std::string shortName() const; + + /** Translated long name like <tt>SUSE Linux Enterprise Server 10</tt>*/ + std::string longName( const Locale & lang_r = Locale() ) const; + + /** Vendor specific distribution id. */ + std::string distributionName() const; + + /** Vendor specific distribution version. */ + Edition distributionEdition() const; + //@} + }; + /////////////////////////////////////////////////////////////////// + + /** \relates ProductInfo Stream output */ + std::ostream & operator<<( std::ostream & str, const ProductInfo & obj ); + + /** \relates ProductInfo */ + inline bool operator==( const ProductInfo & lhs, const ProductInfo & rhs ) + { return lhs.satSolvable() == rhs.satSolvable(); } + + /** \relates ProductInfo */ + inline bool operator!=( const ProductInfo & lhs, const ProductInfo & rhs ) + { return lhs.satSolvable() != rhs.satSolvable(); } + + /** \relates ProductInfo */ + inline bool operator<( const ProductInfo & lhs, const ProductInfo & rhs ) + { return lhs.satSolvable() < rhs.satSolvable(); } + + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_PRODUCTINFO_H Modified: trunk/libzypp/zypp/ResObject.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.cc?rev=10… ============================================================================== --- trunk/libzypp/zypp/ResObject.cc (original) +++ trunk/libzypp/zypp/ResObject.cc Thu Jul 31 22:57:10 2008 @@ -16,6 +16,7 @@ #include "zypp/sat/Solvable.h" #include "zypp/Repository.h" #include "zypp/RepoInfo.h" +#include "zypp/ProductInfo.h" #include "zypp/IdString.h" using namespace zypp; @@ -55,9 +56,13 @@ } /////////////////////////////////////////////////////////////////// - // - // ResObject interface forwarded to implementation - // + + bool ResObject::hasProductInfo() const + { return ProductInfo( *this ); } // this is basically one lookupIdAttribute call + + ProductInfo ResObject::productInfo() const + { return ProductInfo( *this ); } + /////////////////////////////////////////////////////////////////// std::string ResObject::summary( const Locale & lang_r ) const Modified: trunk/libzypp/zypp/ResObject.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.h?rev=107… ============================================================================== --- trunk/libzypp/zypp/ResObject.h (original) +++ trunk/libzypp/zypp/ResObject.h Thu Jul 31 22:57:10 2008 @@ -30,6 +30,8 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + class ProductInfo; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : ResObject @@ -65,6 +67,18 @@ //@} public: + /** \name Associated product metadata. + * Some \ref Packages may provide additional product metadata. + * \see \ref ProductInfo. + */ + //@{ + /** Whether there is associated \ref ProductInfo available. */ + bool hasProductInfo() const; + /** Return associated \ref ProductInfo or \ref ProductInfo::noProductInfo. */ + ProductInfo productInfo() const; + //@} + + public: /** * \short Short text describing the resolvable. -- 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] r10714 - /trunk/libzypp/zypp/ResTraits.h
by mlandres＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: mlandres Date: Thu Jul 31 20:24:38 2008 New Revision: 10714 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10714&view=rev Log: add PoolItem forward decl. Modified: trunk/libzypp/zypp/ResTraits.h Modified: trunk/libzypp/zypp/ResTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResTraits.h?rev=107… ============================================================================== --- trunk/libzypp/zypp/ResTraits.h (original) +++ trunk/libzypp/zypp/ResTraits.h Thu Jul 31 20:24:38 2008 @@ -56,6 +56,9 @@ DEFINE_PTR_TYPE( Patch ); //@} + /** Frequently associated. */ + class PoolItem; + /** ResTraits. Defines common types and the ResKind value. */ template<typename _Res> struct ResTraits -- 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] r10713 - /trunk/libzypp/package/libzypp.changes
by dmacvicar＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: dmacvicar Date: Thu Jul 31 19:14:05 2008 New Revision: 10713 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10713&view=rev Log: fix changelog 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 Thu Jul 31 19:14:05 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 31 19:01:54 CEST 2008 - dmacvicar(a)suse.de + +- generate a unique anonymous unique string per target + and add it to the agent string for better statistics + +------------------------------------------------------------------- Thu Jul 31 19:01:14 CEST 2008 ma(a)suse.de - Follow solver policy and make repository priority the highest @@ -6,12 +12,6 @@ - revision 10710 ------------------------------------------------------------------- -Thu Jul 31 19:01:54 CEST 2008 - dmacvicar(a)suse.de - -- generate a unique anonymous unique string per target - and add it to the agent string for better statistics - -------------------------------------------------------------------- Wed Jul 30 19:12:00 CEST 2008 ma(a)suse.de - /var/lib/zypp and /var/cache/zypp should be owned by libzypp -- 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] r10712 - in /trunk/libzypp: ./ package/ tests/zypp/ zypp/ zypp/media/ zypp/target/
by dmacvicar＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: dmacvicar Date: Thu Jul 31 19:08:19 2008 New Revision: 10712 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10712&view=rev Log: generate a unique anonymous unique string per target and add it to the agent string for better statistics Added: trunk/libzypp/tests/zypp/Target_test.cc Modified: trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/tests/zypp/CMakeLists.txt trunk/libzypp/zypp/Target.cc trunk/libzypp/zypp/Target.h trunk/libzypp/zypp/media/MediaCurl.cc trunk/libzypp/zypp/target/TargetImpl.cc trunk/libzypp/zypp/target/TargetImpl.h 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 Thu Jul 31 19:08:19 2008 @@ -29,6 +29,7 @@ %if 0%{?suse_version} BuildRequires: hicolor-icon-theme update-desktop-files rpm-devel +Requires: uuid-runtime %endif %if 0%{?fedora_version} @@ -38,6 +39,8 @@ %if 0%{?mandriva_version} BuildRequires: glib2-devel BuildRequires: librpm-devel +# uuidgen +Requires: e2fsprogs %endif 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 Thu Jul 31 19:08:19 2008 @@ -6,6 +6,12 @@ - revision 10710 ------------------------------------------------------------------- +Thu Jul 31 19:01:54 CEST 2008 - dmacvicar(a)suse.de + +- generate a unique anonymous unique string per target + and add it to the agent string for better statistics + +------------------------------------------------------------------- Wed Jul 30 19:12:00 CEST 2008 ma(a)suse.de - /var/lib/zypp and /var/cache/zypp should be owned by libzypp Modified: trunk/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.tx… ============================================================================== --- trunk/libzypp/tests/zypp/CMakeLists.txt (original) +++ trunk/libzypp/tests/zypp/CMakeLists.txt Thu Jul 31 19:08:19 2008 @@ -28,6 +28,7 @@ RepoManager RepoStatus ResKind + Target TranslatedText Url Vendor Added: trunk/libzypp/tests/zypp/Target_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Target_test.c… ============================================================================== --- trunk/libzypp/tests/zypp/Target_test.cc (added) +++ trunk/libzypp/tests/zypp/Target_test.cc Thu Jul 31 19:08:19 2008 @@ -0,0 +1,32 @@ + +#include <iostream> +#include <list> +#include <string> + +// Boost.Test +#include <boost/test/auto_unit_test.hpp> + +#include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" +#include "zypp/ZYppFactory.h" +#include "zypp/ZYpp.h" +#include "zypp/ZYppFactory.h" +#include "zypp/TmpPath.h" + +using boost::unit_test::test_case; +using namespace std; +using namespace zypp; + + +BOOST_AUTO_TEST_CASE(target_test) +{ + + filesystem::TmpDir tmp; + + ZYpp::Ptr z = getZYpp(); + z->initializeTarget( tmp.path() ); + + BOOST_CHECK( ! z->target()->anonymousUniqueId().empty() ); + BOOST_CHECK( PathInfo( tmp.path() / "/var/lib/zypp/AnonymousUniqueId").isExist() ); + BOOST_CHECK( PathInfo( tmp.path() / "/var/lib/zypp/AnonymousUniqueId").size() > 0 ); +} Modified: trunk/libzypp/zypp/Target.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Target.cc?rev=10712… ============================================================================== --- trunk/libzypp/zypp/Target.cc (original) +++ trunk/libzypp/zypp/Target.cc Thu Jul 31 19:08:19 2008 @@ -100,6 +100,9 @@ std::string Target::release() const { return _pimpl->release(); } + std::string Target::anonymousUniqueId() const + { return _pimpl->anonymousUniqueId(); } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/Target.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Target.h?rev=10712&… ============================================================================== --- trunk/libzypp/zypp/Target.h (original) +++ trunk/libzypp/zypp/Target.h Thu Jul 31 19:08:19 2008 @@ -110,6 +110,16 @@ */ std::string release() const; + /** + * anonymous unique id + * + * This id is generated once and stays in the + * saved in the target. + * It is unique and is used only for statistics. + * + */ + std::string anonymousUniqueId() const; + public: /** Ctor. If \c doRebuild_r is \c true, an already existing * database is rebuilt (rpm --rebuilddb ). 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 Thu Jul 31 19:08:19 2008 @@ -26,6 +26,9 @@ #include "zypp/media/MediaUserAuth.h" #include "zypp/media/CurlConfig.h" #include "zypp/thread/Once.h" +#include "zypp/Target.h" +#include "zypp/ZYppFactory.h" + #include <cstdlib> #include <sys/types.h> #include <sys/stat.h> @@ -183,9 +186,29 @@ const char *const MediaCurl::agentString() { - static const std::string _value( str::form( "ZYpp %s (curl %s)", + // we need to add the release and identifier to the + // agent string. + // The target could be not initialized, and then this information + // is not available. + Target_Ptr target; + // FIXME this has to go away as soon as the target + // does not throw when not initialized. + try { + target = zypp::getZYpp()->target(); + } + catch ( const Exception &e ) + { + // nothing to do + } + + static const std::string _value( str::form( "ZYpp %s (curl %s) %s", VERSION, - curl_version_info(CURLVERSION_NOW)->version ) ); + curl_version_info(CURLVERSION_NOW)->version, + target ? str::form( " - %s on '%s'", + target->anonymousUniqueId().c_str(), + target->release().c_str() ).c_str() + : "" ) + ); return _value.c_str(); } Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Thu Jul 31 19:08:19 2008 @@ -287,6 +287,52 @@ , _hardLocksFile( Pathname::assertprefix( _root, ZConfig::instance().locksFile() ) ) { _rpm.initDatabase( root_r, Pathname(), doRebuild_r ); + + // create the anonymous unique id + // this value is used for statistics + Pathname idpath( home() / "AnonymousUniqueId"); + + if ( ! PathInfo( idpath ).isExist() ) + { + MIL << "creating anonymous unique id" << endl; + + // if the file does not exist we need to generate the uuid file + const char* argv[] = + { + "/usr/bin/uuidgen", + "-r", + "-t", + NULL + }; + + ExternalProgram prog( argv, + ExternalProgram::Normal_Stderr, + false, -1, true); + std::string line; + std::ofstream idfile; + // make sure the path exists + filesystem::assert_dir( home() ); + idfile.open( idpath.c_str() ); + + if ( idfile.good() ) + { + for(line = prog.receiveLine(); + ! line.empty(); + line = prog.receiveLine() ) + { + MIL << line << endl; + + idfile << line; + } + prog.close(); + } + else + { + // FIXME, should we ignore the error? + ZYPP_THROW(Exception("Can't open anonymous id file '" + idpath.asString() + "' for writing")); + } + } + MIL << "Initialized target on " << _root << endl; } @@ -822,6 +868,18 @@ return _("Unknown Distribution"); } + std::string TargetImpl::anonymousUniqueId() const + { + std::ifstream idfile( ( home() / "AnonymousUniqueId" ).c_str() ); + for( iostr::EachLine in( idfile ); in; in.next() ) + { + std::string line( str::trim( *in ) ); + if ( ! line.empty() ) + return line; + } + return std::string(); + } + void TargetImpl::installSrcPackage( const SrcPackage_constPtr & srcPackage_r ) { // provide on local disk Modified: trunk/libzypp/zypp/target/TargetImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.h… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.h (original) +++ trunk/libzypp/zypp/target/TargetImpl.h Thu Jul 31 19:08:19 2008 @@ -78,6 +78,8 @@ void buildCache(); + std::string anonymousUniqueId() const; + public: /** The root set for this target */ -- 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] r10711 - /trunk/libzypp/zypp/ExternalProgram.h
by dmacvicar＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: dmacvicar Date: Thu Jul 31 19:08:18 2008 New Revision: 10711 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10711&view=rev Log: add example code Modified: trunk/libzypp/zypp/ExternalProgram.h Modified: trunk/libzypp/zypp/ExternalProgram.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ExternalProgram.h?r… ============================================================================== --- trunk/libzypp/zypp/ExternalProgram.h (original) +++ trunk/libzypp/zypp/ExternalProgram.h Thu Jul 31 19:08:18 2008 @@ -27,6 +27,30 @@ * an external program. It starts the program using fork * and some exec.. call, gives you access to the program's * stdio and closes the program after use. + * + * \code + * + * const char* argv[] = + * { + * "/usr/bin/foo, + * "--option1", + * "--option2", + * NULL + * }; + * + * ExternalProgram prog( argv, + * ExternalProgram::Discard_Stderr, + * false, -1, true); + * string line; + * for(line = prog.receiveLine(); + * ! line.empty(); + * line = prog.receiveLine() ) + * { + * stream << line; + * } + * prog.close(); + * + * \endcode */ class ExternalProgram : public zypp::externalprogram::ExternalDataSource { -- 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] r10710 - in /trunk/libzypp: package/libzypp.changes zypp/ui/SelectableTraits.h
by mlandres＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: mlandres Date: Thu Jul 31 19:05:12 2008 New Revision: 10710 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10710&view=rev Log: - Follow solver policy and make repository priority the highest key, when ordering packages. Then architecture, and edition last. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/ui/SelectableTraits.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 Thu Jul 31 19:05:12 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 31 19:01:14 CEST 2008 ma(a)suse.de + +- Follow solver policy and make repository priority the highest + key, when ordering packages. Then architecture, and edition last. +- revision 10710 + +------------------------------------------------------------------- Wed Jul 30 19:12:00 CEST 2008 ma(a)suse.de - /var/lib/zypp and /var/cache/zypp should be owned by libzypp Modified: trunk/libzypp/zypp/ui/SelectableTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableTraits… ============================================================================== --- trunk/libzypp/zypp/ui/SelectableTraits.h (original) +++ trunk/libzypp/zypp/ui/SelectableTraits.h Thu Jul 31 19:05:12 2008 @@ -33,6 +33,7 @@ struct SelectableTraits { /** Oder on AvalableItemSet. + * \li repository priority * \li best Arch * \li best Edition * \li ResObject::constPtr as fallback. @@ -46,6 +47,10 @@ // bool operator()( const PoolItem & lhs, const PoolItem & rhs ) const { + unsigned lprio = lhs->satSolvable().repository().info().priority(); + unsigned rprio = rhs->satSolvable().repository().info().priority(); + if ( lprio != rprio ) + return( lprio < rprio ); // lower value meands higher priority :( int res = lhs->arch().compare( rhs->arch() ); if ( res ) return res > 0; -- 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] r10709 - /trunk/libzypp/libzypp.spec.cmake
by mlandres＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: mlandres Date: Thu Jul 31 18:43:21 2008 New Revision: 10709 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10709&view=rev Log: fix specfile 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 Thu Jul 31 18:43:21 2008 @@ -116,6 +116,8 @@ mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d mkdir -p $RPM_BUILD_ROOT/etc/zypp/products.d mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d +mkdir -p $RPM_BUILD_ROOT/var/lib/zypp +mkdir -p $RPM_BUILD_ROOT/var/cache/zypp %if 0%{?suse_version} %suse_update_desktop_file -G "" -C "" package-manager -- 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] r10708 - /trunk/libzypp/zypp/RepoInfo.h
by mlandres＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: mlandres Date: Thu Jul 31 17:08:02 2008 New Revision: 10708 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10708&view=rev Log: remove undefined static function Modified: trunk/libzypp/zypp/RepoInfo.h Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=1070… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Thu Jul 31 17:08:02 2008 @@ -69,9 +69,6 @@ friend std::ostream & operator<<( std::ostream & str, const RepoInfo & obj ); public: - static unsigned defaultPrioity(); - - public: RepoInfo(); ~RepoInfo(); -- 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] r10707 - in /trunk/libzypp-bindings: VERSION.cmake package/libzypp-bindings.changes swig/RepoInfo.i swig/zypp.i
by mlandres＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: mlandres Date: Thu Jul 31 14:29:37 2008 New Revision: 10707 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10707&view=rev Log: - Work around undefined symbols in libzypp. (bnc #391831) - Adapt to zypp::Service being renamed to ServiceInfo Modified: trunk/libzypp-bindings/VERSION.cmake trunk/libzypp-bindings/package/libzypp-bindings.changes trunk/libzypp-bindings/swig/RepoInfo.i trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/VERSION.cmake?r… ============================================================================== --- trunk/libzypp-bindings/VERSION.cmake (original) +++ trunk/libzypp-bindings/VERSION.cmake Thu Jul 31 14:29:37 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "4") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") Modified: trunk/libzypp-bindings/package/libzypp-bindings.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/package/libzypp… ============================================================================== --- trunk/libzypp-bindings/package/libzypp-bindings.changes (original) +++ trunk/libzypp-bindings/package/libzypp-bindings.changes Thu Jul 31 14:29:37 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jul 31 14:25:21 CEST 2008 ma(a)suse.de + +- Work around undefined symbols in libzypp. (bnc #391831) +- Adapt to zypp::Service being renamed to ServiceInfo +- revision 10707 +- version 0.4.7 + +------------------------------------------------------------------- Fri Jul 25 19:29:11 CEST 2008 - ma(a)suse.de - Removed almost all local copies of zypp header files. This also Modified: trunk/libzypp-bindings/swig/RepoInfo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/RepoInfo.i… ============================================================================== --- trunk/libzypp-bindings/swig/RepoInfo.i (original) +++ trunk/libzypp-bindings/swig/RepoInfo.i Thu Jul 31 14:29:37 2008 @@ -3,6 +3,9 @@ %template(UrlSet) std::set<Url>; #endif +// This is due to a typo in libzypp < 5.4.0 +%ignore zypp::RepoInfo::defaultPrioity(); + %include <zypp/RepoInfo.h> typedef std::list<zypp::RepoInfo> RepoInfoList; %template(RepoInfoList) std::list<zypp::RepoInfo>; Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Thu Jul 31 14:29:37 2008 @@ -42,7 +42,6 @@ #include "zypp/Repository.h" #include "zypp/ServiceInfo.h" #include "zypp/RepoManager.h" -#include "zypp/Service.h" #include "zypp/repo/RepoType.h" #include "zypp/TmpPath.h" #include "zypp/Resolver.h" -- 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] r10706 - /trunk/libzypp/mkChangelog
by mlandres＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: mlandres Date: Thu Jul 31 12:26:44 2008 New Revision: 10706 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10706&view=rev Log: mkChangelog: show current version and last changelog entry as summary Modified: trunk/libzypp/mkChangelog Modified: trunk/libzypp/mkChangelog URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/mkChangelog?rev=10706&r1… ============================================================================== --- trunk/libzypp/mkChangelog (original) +++ trunk/libzypp/mkChangelog Thu Jul 31 12:26:44 2008 @@ -13,12 +13,13 @@ TDIR=$(dirname $0) test -n "$TDIR" && cd $TDIR -CHANGESFILE="package/libzypp.changes" +CHANGESFILE=$(ls package/*.changes) test -f "$CHANGESFILE" || errexit "No changes file '$CHANGESFILE'" VERSIONFILE="VERSION.cmake" test -f "$VERSIONFILE" || errexit "No version file '$VERSIONFILE'" +## Version.cmake tags in getversion() are still zypp specific. function usage() { exec >&2 @@ -44,7 +45,7 @@ The line '#---delete-or-release---#...' shows the last version submitted to autobuild ('# LAST RELEASED:; tag in $VERSIONFILE). And also the current version, asuming you already updated the $VERSIONFILE according to your changes. -(The number in parenthesis is LIBZYPP_COMPATMINOR) +(The number in parenthesis is _COMPATMINOR) - Delete the line if you don't want to submit the package to autobuild. @@ -111,11 +112,11 @@ | awk '/^Status against revision:/{print $4+1}' } -VERSIONNUMBER="$(getversion)" test -r /etc/sysconfig/mail && source /etc/sysconfig/mail EMAIL="${USER}@${FROM_HEADER:-$(hostname -f)}" +GOTVERSION="$(getversion)" TMPFILE=$(mktemp) exec 3>&1- @@ -125,7 +126,7 @@ echo "" echo "- " echo "- revision $(nextrevision)" -echo "$(getversion)" +echo "$GOTVERSION" echo "" cat $CHANGESFILE exec >&3 @@ -138,6 +139,7 @@ test -n "$NEWREL" && echo "$NEWREL" read -n 1 -p "(a)bort, (c)ontinue, (e)dit : " RES echo + echo case "$RES" in [eE]*) RES=e @@ -153,8 +155,9 @@ echo "Store new $CHANGESFILE" cp $TMPFILE $CHANGESFILE - cat $CHANGESFILE \ - | awk '{print}/----------/{n=n+1; if ( n == 2 ) exit 0; }' + echo "$(sed 's/^.*#---delete-or-release---#.*RELEASE:/# CURRENT RELEASE:/' <<<"$GOTVERSION")" + awk '{print}/^----------/{n=n+1; if ( n == 2 ) exit 0; }' $CHANGESFILE + ;; *) echo "Leave $CHANGESFILE untouched" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0