Hello community,
here is the log from the commit of package zypper
checked in at Mon Aug 20 17:45:47 CEST 2007.
--------
--- zypper/zypper.changes 2007-08-17 15:23:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2007-08-20 14:19:39.369050000 +0200
@@ -1,0 +2,13 @@
+Mon Aug 20 14:16:20 CEST 2007 - kkaempf@suse.de
+
+- fix first column (i/v) of 'search' output
+- r6759
+- 0.8.14
+
+-------------------------------------------------------------------
+Mon Aug 20 13:55:53 CEST 2007 - kkaempf@suse.de
+
+- adapt to unified query API of libzypp-3.18.x
+- r6756
+
+-------------------------------------------------------------------
Old:
----
zypper-0.8.13.tar.bz2
New:
----
zypper-0.8.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.y31131/_old 2007-08-20 17:44:46.000000000 +0200
+++ /var/tmp/diff_new_pack.y31131/_new 2007-08-20 17:44:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package zypper (Version 0.8.13)
+# spec file for package zypper (Version 0.8.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: zypper
-BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 3.17.0 readline-devel >= 5.1
+BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 3.18.0 readline-devel >= 5.1
BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.2 pkg-config >= 0.20
Requires: procps
License: GPL v2 or later
@@ -20,9 +20,9 @@
Autoreqprov: on
PreReq: permissions
Summary: Command Line Package Management Using Libzypp
-Version: 0.8.13
+Version: 0.8.14
Release: 1
-Source: zypper-0.8.13.tar.bz2
+Source: zypper-0.8.14.tar.bz2
Prefix: /usr
URL: http://en.opensuse.org/Zypper
Provides: y2pmsh
@@ -97,6 +97,13 @@
%ghost %config(noreplace) %{_var}/log/zypper.log
%changelog
+* Mon Aug 20 2007 - kkaempf@suse.de
+- fix first column (i/v) of 'search' output
+- r6759
+- 0.8.14
+* Mon Aug 20 2007 - kkaempf@suse.de
+- adapt to unified query API of libzypp-3.18.x
+- r6756
* Fri Aug 17 2007 - jkupec@suse.cz
- text update from proof-reading
- some output clean-up
++++++ zypper-0.8.13.tar.bz2 -> zypper-0.8.14.tar.bz2 ++++++
++++ 1685 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.8.13/doc/devel-checklist new/zypper-0.8.14/doc/devel-checklist
--- old/zypper-0.8.13/doc/devel-checklist 2007-08-17 15:21:03.000000000 +0200
+++ new/zypper-0.8.14/doc/devel-checklist 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-Things to check when adding/changing a feature:
-
-( ) use cout_n, cout_v, cout_vv, cerr_v, cerr_vv macros for output
-( ) mark *_n and *_v output for translation
-( ) use DBG, MIL, WAR, ERR macros for logging to zypper.log (not translated)
-( ) support --non-interactive mode (for scripting) if the feature requires
- interaction
-( ) check if documentation needs update (--help texts, man page, wiki)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.8.13/package/zypper.changes new/zypper-0.8.14/package/zypper.changes
--- old/zypper-0.8.13/package/zypper.changes 2007-08-17 15:21:03.000000000 +0200
+++ new/zypper-0.8.14/package/zypper.changes 2007-08-20 14:18:58.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Mon Aug 20 14:16:20 CEST 2007 - kkaempf@suse.de
+
+- fix first column (i/v) of 'search' output
+- r6759
+- 0.8.14
+
+-------------------------------------------------------------------
+Mon Aug 20 13:55:53 CEST 2007 - kkaempf@suse.de
+
+- adapt to unified query API of libzypp-3.18.x
+- r6756
+
+-------------------------------------------------------------------
Fri Aug 17 15:16:32 CEST 2007 - jkupec@suse.cz
- text update from proof-reading
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.8.13/src/zypper-media-callbacks.h.rej new/zypper-0.8.14/src/zypper-media-callbacks.h.rej
--- old/zypper-0.8.13/src/zypper-media-callbacks.h.rej 2007-08-17 15:21:03.000000000 +0200
+++ new/zypper-0.8.14/src/zypper-media-callbacks.h.rej 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-***************
-*** 20,25 ****
- #include
- #include
- #include
-
- #include "AliveCursor.h"
-
---- 20,26 ----
- #include
- #include
- #include
-+ #include
-
- #include "AliveCursor.h"
-
-***************
-*** 71,77 ****
- display_error (error, konreason);
- }
- };
-
- ///////////////////////////////////////////////////////////////////
- }; // namespace ZmartRecipients
- ///////////////////////////////////////////////////////////////////
---- 72,113 ----
- display_error (error, konreason);
- }
- };
-+
-+ struct AuthenticationReportReceiver : public zypp::callback::ReceiveReportzypp::media::AuthenticationReport
-+ {
-+ virtual bool prompt(const zypp::Url & url,
-+ const std::string & description,
-+ zypp::media::AuthData & auth_data)
-+ {
-+ std::cout << description << std::endl;
-+
-+ // curl authentication
-+ zypp::media::CurlAuthData * auth_data_ptr =
-+ dynamic_castzypp::media::CurlAuthData* (&auth_data);
-+ if (auth_data_ptr)
-+ {
-+ std::cout << "available auth types: "
-+ << auth_data_ptr->authTypeAsString() << std::endl;
-
-+ std::cout << "User Name: ";
-+ string username;
-+ std::cin >> username;
-+ auth_data_ptr->setUserName(username);
-+
-+ std::cout << "Password: ";
-+ string password;
-+ std::cin >> password;
-+ if (password.empty()) return false;
-+ auth_data_ptr->setPassword(password);
-+
-+ auth_data_ptr->setAuthType("basic,digest");
-+
-+ return true;
-+ }
-+
-+ return false;
-+ }
-+ };
- ///////////////////////////////////////////////////////////////////
- }; // namespace ZmartRecipients
- ///////////////////////////////////////////////////////////////////
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.8.13/src/zypper-search.cc new/zypper-0.8.14/src/zypper-search.cc
--- old/zypper-0.8.13/src/zypper-search.cc 2007-08-17 15:21:03.000000000 +0200
+++ new/zypper-0.8.14/src/zypper-search.cc 2007-08-20 14:18:58.000000000 +0200
@@ -36,7 +36,8 @@
const vector<string> qstrings
) :
_zypp(zypp), _options(options), _qstrings(qstrings), _query( _manager_options.repoCachePath ) {
-#if 0
+
+#if 0 // we don't search the pool but iterate on the cache directly, hence no repos needed
// no repos warning
if (gData.repos.empty()) {
cerr << _("No repositories configured. Please add at least one"
@@ -45,9 +46,10 @@
exit(ZYPPER_EXIT_NO_REPOS); // TODO #define zypper error codes?
}
#endif
+
setupRegexp();
cacheInstalled();
-#if 0
+#if 0 // we iterate directly on the cache, no ResPool populate needed
load_repo_resolvables(); // populates ResPool with resolvables from repos
#endif
// cache identification strings of source resolvables (used to check for
@@ -91,7 +93,7 @@
{
std::vectorzypp::Resolvable::Kind kinds;
kinds.push_back( _options.kind() );
- _query.iterateResolvablesByKindsAndName( kinds, _qstrings[0], _options.matchExact() ? 0 : 3, cache_cb );
+ _query.iterateResolvablesByKindsAndStrings( kinds, _qstrings, (_options.matchExact() ? cache::MATCH_EXACT : cache::MATCH_SUBSTRING)|cache::MATCH_NAME, cache_cb );
}
}
catch ( const Exception & excpt_r )
@@ -127,7 +129,7 @@
std::vectorzypp::Resolvable::Kind kinds;
kinds.push_back( ResTraits<Package>::kind );
- _query.iterateResolvablesByKindsAndName( kinds, _qstrings[0], 0, cache_cb );
+ _query.iterateResolvablesByKindsAndStrings( kinds, _qstrings, cache::MATCH_EXACT|cache::MATCH_NAME, cache_cb );
}
catch ( const Exception & excpt_r )
{
@@ -156,7 +158,7 @@
std::vectorzypp::Resolvable::Kind kinds;
kinds.push_back( ResTraits<Package>::kind );
- _query.iterateResolvablesByKindsAndName( kinds, _qstrings[0], 3, cache_cb );
+ _query.iterateResolvablesByKindsAndStrings( kinds, _qstrings, cache::MATCH_SUBSTRING|cache::MATCH_NAME, cache_cb );
}
catch ( const Exception & excpt_r )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.8.13/src/zypper-search.h new/zypper-0.8.14/src/zypper-search.h
--- old/zypper-0.8.13/src/zypper-search.h 2007-08-17 15:21:03.000000000 +0200
+++ new/zypper-0.8.14/src/zypper-search.h 2007-08-20 14:18:58.000000000 +0200
@@ -109,12 +109,21 @@
(_incl_kind_in_key ? pi.resolvable()->kind().asString() : "");
}
+ std::string getKey( const zypp::data::ResObject_Ptr res ) const {
+ return res->name +
+ (_incl_kind_in_key ? res->kind.asString() : "");
+ }
+
void addItem(const zypp::PoolItem & pi) { _items[getKey(pi)] = pi; }
zypp::PoolItem & getItem(const zypp::PoolItem & pi) {
return _items[getKey(pi)];
}
+ zypp::PoolItem & getItem( const zypp::data::ResObject_Ptr res ) {
+ return _items[getKey( res )];
+ }
+
unsigned int size() {
return _items.size();
}
@@ -126,9 +135,8 @@
}
/** defined for use as a functor for filling the hashmap in a for_each */
- // FIXME: should be cache::ProcessResolvable
bool operator()(const zypp::data::RecordId & id, const zypp::data::ResObject_Ptr res) {
- // dummy
+ // dummy, since zypp::data::ResObject_Ptr is never 'installed'
return true;
}
@@ -152,12 +160,22 @@
pi.resolvable()->kind().asString() + pi.resolvable()->arch().asString();
}
+ std::string getKey(const zypp::data::ResObject_Ptr res) const {
+ return res->name + res->edition.asString() +
+ res->kind.asString() + res->arch.asString();
+ }
+
void addItem(const zypp::PoolItem & pi) { _items.insert(getKey(pi)); }
+ void addItem(const zypp::data::ResObject_Ptr res) { _items.insert(getKey(res)); }
bool contains(const zypp::PoolItem & pi) {
return _items.count(getKey(pi));
}
+ bool contains(const zypp::data::ResObject_Ptr res) {
+ return _items.count(getKey(res));
+ }
+
/** defined for use as a functor for filling the IdSet in a for_each */
bool operator()(const zypp::PoolItem & pi) {
addItem(pi);
@@ -165,9 +183,8 @@
}
/** defined for use as a functor for filling the IdSet in a for_each */
- // FIXME: should be cache::ProcessResolvable
bool operator()(const zypp::data::RecordId & id, const zypp::data::ResObject_Ptr res) {
- // dummy
+ addItem( res );
return true;
}
@@ -310,7 +327,7 @@
TableRow row;
// add status to the result table
- zypp::PoolItem inst_item; // = _icache->getItem(pool_item);
+ zypp::PoolItem inst_item = _icache->getItem( res );
if (inst_item) {
// check whether the pool item is installed...
if (inst_item.resolvable()->edition() == res->edition &&
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.8.13/VERSION.cmake new/zypper-0.8.14/VERSION.cmake
--- old/zypper-0.8.13/VERSION.cmake 2007-08-17 15:21:03.000000000 +0200
+++ new/zypper-0.8.14/VERSION.cmake 2007-08-20 14:18:58.000000000 +0200
@@ -20,4 +20,4 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "8")
-SET(VERSION_PATCH "13")
+SET(VERSION_PATCH "14")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.8.13/zypper.spec.cmake new/zypper-0.8.14/zypper.spec.cmake
--- old/zypper-0.8.13/zypper.spec.cmake 2007-08-17 15:21:03.000000000 +0200
+++ new/zypper-0.8.14/zypper.spec.cmake 2007-08-20 14:18:58.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild
Name: @PACKAGE@
-BuildRequires: libzypp-devel >= 3.17.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
+BuildRequires: libzypp-devel >= 3.18.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
BuildRequires: gcc-c++ >= 4.2 cmake >= 2.4.6 pkg-config >= 0.20
Requires: procps
License: GPL
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org