Mailinglist Archive: opensuse-commit (159 mails)

< Previous Next >
commit libzypp-zmd-backend
  • From: root@xxxxxxx (h_root)
  • Date: Wed, 29 Mar 2006 16:51:29 +0200 (CEST)
  • Message-id: <20060329145129.DE60C8AD7C@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libzypp-zmd-backend
checked in at Wed Mar 29 16:51:29 CEST 2006.

--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 13:31:02.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 15:01:29.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Mar 29 15:00:06 CEST 2006 - kkaempf@xxxxxxx
+
+- report proper error if .rpm file can't be found (#160402)
+- dont ask for media 0
+- rev 2751
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.P5E81x/_old 2006-03-29 16:49:38.000000000 +0200
+++ /var/tmp/diff_new_pack.P5E81x/_new 2006-03-29 16:49:38.000000000 +0200
@@ -22,7 +22,7 @@
Obsoletes: zmd-librc-backend
Summary: ZMD backend for Package, Patch, Pattern, and Product Management
Version: 7.1.1
-Release: 20
+Release: 21
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr

@@ -69,6 +69,10 @@

%changelog -n libzypp-zmd-backend
* Wed Mar 29 2006 - kkaempf@xxxxxxx
+- report proper error if .rpm file can't be found (#160402)
+- dont ask for media 0
+- rev 2751
+* Wed Mar 29 2006 - kkaempf@xxxxxxx
- call the correct 'getZYpp()' function.
- fix argument parsing in resolve-dependencies (#161699)
- rev 2748

++++++ zmd-backend-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/MediaChangeCallback.h new/zmd-backend-7.1.1/src/MediaChangeCallback.h
--- old/zmd-backend-7.1.1/src/MediaChangeCallback.h 2006-03-09 11:48:40.000000000 +0100
+++ new/zmd-backend-7.1.1/src/MediaChangeCallback.h 2006-03-29 14:57:27.000000000 +0200
@@ -6,7 +6,7 @@
| /_____||_| |_| |_| |
| |
\---------------------------------------------------------------------*/
-/** \file zmd/backend/MediaChangeCallback.cc
+/** \file zmd/backend/MediaChangeCallback.h
*
*/

@@ -48,23 +48,31 @@

DBG << "requestMedia(" << source << ", " << mediumNr << ", " << error << ", " << description << ")" << endl;

- // request media via stdout
+ if (mediumNr > 0) {

- std::cout << "10|" << mediumNr;
+ // request media via stdout

- std::string product_name;
+ std::cout << "10|" << mediumNr;

- // get name of the product
- for (zypp::ResStore::iterator it = source.resolvables().begin(); it != source.resolvables().end(); it++)
- {
- // is it a product object?
- if (zypp::isKind<zypp::Product>( *it ))
+ std::string product_name;
+
+ // get name of the product
+ for (zypp::ResStore::iterator it = source.resolvables().begin(); it != source.resolvables().end(); it++)
{
- product_name = (*it)->name();
- break;
- }
+ // is it a product object?
+ if (zypp::isKind<zypp::Product>( *it ))
+ {
+ product_name = (*it)->name();
+ break;
+ }
+ }
+
+ if (product_name.empty()) {
+ product_name = description;
+ }
+
+ std::cout << "|" << product_name << std::endl;
}
- std::cout << "|" << product_name << std::endl;

// and abort here.
// This will end the 'transact' helper and its up to ZMD to evaluate the
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/transact.cc new/zmd-backend-7.1.1/src/transact.cc
--- old/zmd-backend-7.1.1/src/transact.cc 2006-03-28 22:25:32.000000000 +0200
+++ new/zmd-backend-7.1.1/src/transact.cc 2006-03-29 14:51:01.000000000 +0200
@@ -139,7 +139,7 @@
ZYPP_CAUGHT( expt_r );
result = 1;
if (m_callback.mediaNr() != 0 // exception due to MediaChange callback ?
- || !m_callback.description().empty())
+ && !m_callback.description().empty())
{
cerr << "Need media " << m_callback.mediaNr() << ": " << m_callback.description() << endl;
}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >