Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2013-11-07 08:42:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2013-10-25 11:10:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2013-11-07 08:42:32.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 25 14:21:31 CEST 2013 - [email protected] + +- Always properly initialize pool storage (bnc#846565) +- version 14.1.1 (0) + +------------------------------------------------------------------- Old: ---- libzypp-14.1.0.tar.bz2 New: ---- libzypp-14.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.O7bCgi/_old 2013-11-07 08:42:33.000000000 +0100 +++ /var/tmp/diff_new_pack.O7bCgi/_new 2013-11-07 08:42:33.000000000 +0100 @@ -23,7 +23,7 @@ Summary: Package, Patch, Pattern, and Product Management License: GPL-2.0+ Group: System/Packages -Version: 14.1.0 +Version: 14.1.1 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-14.1.0.tar.bz2 -> libzypp-14.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/VERSION.cmake new/libzypp-14.1.1/VERSION.cmake --- old/libzypp-14.1.0/VERSION.cmake 2013-10-17 18:01:43.000000000 +0200 +++ new/libzypp-14.1.1/VERSION.cmake 2013-10-25 15:21:46.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "14") SET(LIBZYPP_COMPATMINOR "0") SET(LIBZYPP_MINOR "1") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 14.1.0 (0) +# LAST RELEASED: 14.1.1 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/mkChangelog new/libzypp-14.1.1/mkChangelog --- old/libzypp-14.1.0/mkChangelog 2013-03-20 09:29:29.000000000 +0100 +++ new/libzypp-14.1.1/mkChangelog 2013-10-25 15:49:44.000000000 +0200 @@ -107,13 +107,35 @@ echo "" } +function is_fast_forward() { + git fetch + test "$(git rev-list HEAD..origin/$(git name-rev --name-only HEAD) --count)" == "0" +} + +is_fast_forward || { + Recho "!!!" + Recho "!!! Branch is not fast-forward. Pull changes first." + Recho "!!!" + exit 7 +} + git status --porcelain | grep '^[^ ?]' | grep -v "$VERSIONFILE\|$CHANGESFILE" && { Becho "!!! Files other than version and changes are added to the index." Becho "!!! Doing dryrun..." DRYRUN=1 } + +# A tag for $LAST_RELEASE must exist! +eval $(getversion) +git rev-parse -q --verify "$LAST_RELEASE" >/dev/null || { + Recho "!!!" + Recho "!!! There is no LAST_RELEASE tag '$LAST_RELEASE'. Check manually. " + Recho "!!! (git tag -m 'tagging $LAST_RELEASE' '$LAST_RELEASE' ?commit?)" + Recho "!!!" + exit 8 +} + if [ "$DRYRUN" == "1" ]; then - eval $(getversion) newchangesentry sameVersion && { Becho "!!! Version is unchanged at $LAST_RELEASE ($LAST_COMPAT)." @@ -121,7 +143,6 @@ exit 0 fi - # check version file # while true; do @@ -129,15 +150,15 @@ # $LAST_COMPAT # $THIS_RELEASE # $THIS_COMPAT - eval $(getversion) sameVersion && { newchangesentry Becho "!!! Version is unchanged at $LAST_RELEASE ($LAST_COMPAT)." - read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (e)dit version: ")" RES + read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (e)dit version [e]: ")" RES echo - case "$RES" in + case "${RES:-e}" in [eE]*) $EDITOR $VERSIONFILE + eval $(getversion) continue ;; [cC]) @@ -163,9 +184,9 @@ $EDITOR $TMPFILE echo awk '{print}/^----------/{n=n+1; if ( n == 2 ) exit 0; }' $TMPFILE - read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (s)ubmitt, (e)dit : ")" RES + read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (s)ubmitt, (e)dit [e]: ")" RES echo - case "$RES" in + case "${RES:-e}" in [eE]*) RES=e ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/package/libzypp.changes new/libzypp-14.1.1/package/libzypp.changes --- old/libzypp-14.1.0/package/libzypp.changes 2013-10-17 18:01:43.000000000 +0200 +++ new/libzypp-14.1.1/package/libzypp.changes 2013-10-25 15:21:46.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 25 14:21:31 CEST 2013 - [email protected] + +- Always properly initialize pool storage (bnc#846565) +- version 14.1.1 (0) + +------------------------------------------------------------------- Thu Oct 17 17:57:54 CEST 2013 - [email protected] - Add Package isCached and cachedLocation methods diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/Callback.h new/libzypp-14.1.1/zypp/Callback.h --- old/libzypp-14.1.0/zypp/Callback.h 2013-05-08 09:09:31.000000000 +0200 +++ new/libzypp-14.1.1/zypp/Callback.h 2013-10-25 15:21:46.000000000 +0200 @@ -120,7 +120,7 @@ * a Callback light). * \li \c disconnect Disconnect this ReceiveReport in case it is * connected. If not connected nothing happens. - * \li \c connected Test wheter this ReceiveReport is currently + * \li \c connected Test whether this ReceiveReport is currently * connected. * \li \c whoIsConnected Return a 'ReceiveReport*' to the currently * connected ReceiveReport, or \c NULL if none is connected. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/OnMediaLocation.h new/libzypp-14.1.1/zypp/OnMediaLocation.h --- old/libzypp-14.1.0/zypp/OnMediaLocation.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/OnMediaLocation.h 2013-10-25 15:21:46.000000000 +0200 @@ -126,7 +126,7 @@ { _openchecksum = val_r; return *this; } /** - * Set the wether the resource is optional or not + * Set the whether the resource is optional or not * \see optional */ OnMediaLocation & setOptional( bool val ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/ProgressData.h new/libzypp-14.1.1/zypp/ProgressData.h --- old/libzypp-14.1.0/zypp/ProgressData.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/ProgressData.h 2013-10-25 15:21:46.000000000 +0200 @@ -35,7 +35,7 @@ * needs. As a convention, a zero sizes range indicates that you are just * able to send <em>'still alive'</em> triggers. * - * The counter should be updated in reasonable intervals. Don't mind wheter + * The counter should be updated in reasonable intervals. Don't mind whether * the counter value actually increased or not. ProgressData will recognize * your triggers and knows when to actually send notification to a consumer. * @@ -292,18 +292,18 @@ value_type val() const { return _d->_val; } - /** @return Wheter <tt>[min,max]</tt> defines a nonempty range. */ + /** @return Whether <tt>[min,max]</tt> defines a nonempty range. */ bool hasRange() const { return min() != max(); } - /** @return Wheter \ref reportValue will return a percent value. + /** @return Whether \ref reportValue will return a percent value. * Same as \ref hasRange. * \see \ref reportAlive */ bool reportPercent() const { return hasRange(); } - /** @return Wheter \ref reportValue always returns -1, because we + /** @return Whether \ref reportValue always returns -1, because we * trigger 'still alive' messages. I.e. \ref hasrange is \c false. * \see \ref reportPercent */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/Repository.h new/libzypp-14.1.1/zypp/Repository.h --- old/libzypp-14.1.0/zypp/Repository.h 2013-05-02 11:11:26.000000000 +0200 +++ new/libzypp-14.1.1/zypp/Repository.h 2013-10-25 15:21:46.000000000 +0200 @@ -143,7 +143,7 @@ bool isUpdateRepo() const; /** - * wether the repository claims to update something \ref prod + * whether the repository claims to update something \ref prod * with key \ref cpeid * * \see zypp::Product::cpeId() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/ResPool.h new/libzypp-14.1.1/zypp/ResPool.h --- old/libzypp-14.1.0/zypp/ResPool.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/ResPool.h 2013-10-25 15:21:46.000000000 +0200 @@ -307,7 +307,7 @@ */ const LocaleSet & getRequestedLocales() const; - /** Wheter this \ref Locale is in the set of requested locales. */ + /** Whether this \ref Locale is in the set of requested locales. */ bool isRequestedLocale( const Locale & locale_r ) const; /** Get the set of available locales. @@ -316,7 +316,7 @@ */ const LocaleSet & getAvailableLocales() const; - /** Wheter this \ref Locale is in the set of available locales. */ + /** Whether this \ref Locale is in the set of available locales. */ bool isAvailableLocale( const Locale & locale_r ) const; //@} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/ResStatus.h new/libzypp-14.1.1/zypp/ResStatus.h --- old/libzypp-14.1.0/zypp/ResStatus.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/ResStatus.h 2013-10-25 15:21:46.000000000 +0200 @@ -37,7 +37,7 @@ * nonrelevant: it is unimportant for the user * satisfied: it important nothing has to be done * broken: it is incomplete. So e.g. an update is needed - * \li \c TransactField Wheter to transact this resolvable + * \li \c TransactField Whether to transact this resolvable * (delete if installed install if uninstalled). * In case the resolvable is locked, only USER may modify the * transact bit. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/ServiceInfo.h new/libzypp-14.1.1/zypp/ServiceInfo.h --- old/libzypp-14.1.0/zypp/ServiceInfo.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/ServiceInfo.h 2013-10-25 15:21:46.000000000 +0200 @@ -102,7 +102,7 @@ ReposToEnable::const_iterator reposToEnableBegin() const; ReposToEnable::const_iterator reposToEnableEnd() const; - /** Wheter \c alias_r is mentioned in ReposToEnable. */ + /** Whether \c alias_r is mentioned in ReposToEnable. */ bool repoToEnableFind( const std::string & alias_r ) const; /** Add \c alias_r to the set of ReposToEnable. */ @@ -126,7 +126,7 @@ ReposToDisable::const_iterator reposToDisableBegin() const; ReposToDisable::const_iterator reposToDisableEnd() const; - /** Wheter \c alias_r is mentioned in ReposToDisable. */ + /** Whether \c alias_r is mentioned in ReposToDisable. */ bool repoToDisableFind( const std::string & alias_r ) const; /** Add \c alias_r to the set of ReposToDisable. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/base/NamedValue.h new/libzypp-14.1.1/zypp/base/NamedValue.h --- old/libzypp-14.1.0/zypp/base/NamedValue.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/base/NamedValue.h 2013-10-25 15:21:46.000000000 +0200 @@ -44,7 +44,7 @@ typedef std::map< _Tp, std::string > ValueMap; public: - /** Wheter not initialized (no (name,value) pair remembered) */ + /** Whether not initialized (no (name,value) pair remembered) */ bool empty() const { return( _nameMap.empty() && _valueMap.empty() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/media/MediaCurl.cc new/libzypp-14.1.1/zypp/media/MediaCurl.cc --- old/libzypp-14.1.0/zypp/media/MediaCurl.cc 2013-07-02 14:06:14.000000000 +0200 +++ new/libzypp-14.1.1/zypp/media/MediaCurl.cc 2013-10-25 15:21:46.000000000 +0200 @@ -1441,7 +1441,7 @@ << " bytes." << endl; // the timeout is determined by the progress data object - // which holds wheter the timeout was reached or not, + // which holds whether the timeout was reached or not, // otherwise it would be a user cancel try { evaluateCurlCode( filename, ret, progressData.reached); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/pool/PoolImpl.h new/libzypp-14.1.1/zypp/pool/PoolImpl.h --- old/libzypp-14.1.0/zypp/pool/PoolImpl.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/pool/PoolImpl.h 2013-10-25 15:21:46.000000000 +0200 @@ -373,10 +373,7 @@ bool addedItems = false; std::list<PoolItem> addedProducts; - if ( pool.capacity() != _store.capacity() ) - { - _store.resize( pool.capacity() ); - } + _store.resize( pool.capacity() ); if ( pool.capacity() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/sat/LookupAttr.h new/libzypp-14.1.1/zypp/sat/LookupAttr.h --- old/libzypp-14.1.0/zypp/sat/LookupAttr.h 2013-05-02 11:11:26.000000000 +0200 +++ new/libzypp-14.1.1/zypp/sat/LookupAttr.h 2013-10-25 15:21:46.000000000 +0200 @@ -200,19 +200,19 @@ public: /** \name Where to search. */ //@{ - /** Wheter to search in \ref Pool. */ + /** Whether to search in \ref Pool. */ bool pool() const; /** Set search in \ref Pool (all repositories). */ void setPool( Location = SOLV_ATTR ); - /** Wheter to search in one \ref Repository. */ + /** Whether to search in one \ref Repository. */ Repository repo() const; /** Set search in one \ref Repository. */ void setRepo( Repository repo_r, Location = SOLV_ATTR ); - /** Wheter to search in one \ref Solvable. */ + /** Whether to search in one \ref Solvable. */ Solvable solvable() const; /** Set search in one \ref Solvable. */ @@ -459,7 +459,7 @@ * \endcode */ //@{ - /** Wheter the sub-structure is empty. */ + /** Whether the sub-structure is empty. */ bool subEmpty() const; /** Ammount of attributes in the sub-structure. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/sat/Pool.h new/libzypp-14.1.1/zypp/sat/Pool.h --- old/libzypp-14.1.0/zypp/sat/Pool.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/sat/Pool.h 2013-10-25 15:21:46.000000000 +0200 @@ -196,7 +196,7 @@ */ const LocaleSet & getRequestedLocales() const; - /** Wheter this \ref Locale is in the set of requested locales. */ + /** Whether this \ref Locale is in the set of requested locales. */ bool isRequestedLocale( const Locale & locale_r ) const; /** Get the set of available locales. @@ -205,7 +205,7 @@ */ const LocaleSet & getAvailableLocales() const; - /** Wheter this \ref Locale is in the set of available locales. */ + /** Whether this \ref Locale is in the set of available locales. */ bool isAvailableLocale( const Locale & locale_r ) const; //@} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/sat/Solvable.h new/libzypp-14.1.1/zypp/sat/Solvable.h --- old/libzypp-14.1.0/zypp/sat/Solvable.h 2013-05-02 11:11:26.000000000 +0200 +++ new/libzypp-14.1.1/zypp/sat/Solvable.h 2013-10-25 15:21:46.000000000 +0200 @@ -273,7 +273,7 @@ IdString name() const { return _name; } /** Return an idents explicit kind prefix, or \ref ResKind() if none. - * Mainly to detect wheter a given ident string is explicitly prefixed + * Mainly to detect whether a given ident string is explicitly prefixed * by a known kind (e.g \c pattern:foo or \c package:foo). */ static ResKind explicitKind( IdString ident_r ) { return explicitKind( ident_r.c_str() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.1.0/zypp/target/rpm/librpmDb.h new/libzypp-14.1.1/zypp/target/rpm/librpmDb.h --- old/libzypp-14.1.0/zypp/target/rpm/librpmDb.h 2013-03-20 09:29:30.000000000 +0100 +++ new/libzypp-14.1.1/zypp/target/rpm/librpmDb.h 2013-10-25 15:21:46.000000000 +0200 @@ -79,7 +79,7 @@ static librpmDb::constPtr _defaultDb; /** - * Wheter access is blocked (no _defaultDb will be available). + * Whether access is blocked (no _defaultDb will be available). **/ static bool _dbBlocked; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
