Mailinglist Archive: opensuse-commit (1206 mails)

< Previous Next >
commit libzypp-zmd-backend
  • From: root@xxxxxxx (h_root)
  • Date: Sun, 7 May 2006 16:24:52 +0200 (CEST)
  • Message-id: <20060507142452.98C498C5B6@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libzypp-zmd-backend
checked in at Sun May 7 16:24:52 CEST 2006.

--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-28 14:24:19.000000000 +0200
+++ STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-05-05 15:52:54.000000000 +0200
@@ -1,0 +2,7 @@
+Fri May 5 15:51:56 CEST 2006 - kkaempf@xxxxxxx
+
+- set package_filename and package_url right even for zmd internal
+ services (#171376)
+- rev 3346
+
+-------------------------------------------------------------------
@@ -4 +11 @@
-- create language resolvables.
+- create language resolvables (#170313)

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

Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.SIDcTd/_old 2006-05-07 16:24:31.000000000 +0200
+++ /var/tmp/diff_new_pack.SIDcTd/_new 2006-05-07 16:24:31.000000000 +0200
@@ -22,7 +22,7 @@
Obsoletes: zmd-librc-backend
Summary: ZMD backend for Package, Patch, Pattern, and Product Management
Version: 7.1.1.0
-Release: 38
+Release: 41
Source: zmd-backend-%{version}.tar.bz2
Prefix: /usr

@@ -68,8 +68,12 @@
/etc/logrotate.d/zmd-backend

%changelog -n libzypp-zmd-backend
+* Fri May 05 2006 - kkaempf@xxxxxxx
+- set package_filename and package_url right even for zmd internal
+ services (#171376)
+- rev 3346
* Fri Apr 28 2006 - kkaempf@xxxxxxx
-- create language resolvables.
+- create language resolvables (#170313)
- rev 3265
* Thu Apr 27 2006 - kkaempf@xxxxxxx
- honor YaST lock file (#170113)

++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc new/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc
--- old/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc 2006-04-23 22:36:38.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/dbsource/DbAccess.cc 2006-05-04 10:34:51.000000000 +0200
@@ -609,24 +609,12 @@
sqlite3_bind_text( handle, 2, pkg->group().c_str(), -1, SQLITE_STATIC );
sqlite3_bind_text( handle, 3, pkg->summary().c_str(), -1, SQLITE_STATIC );
sqlite3_bind_text( handle, 4, desc2str(pkg->description()).c_str(), -1, SQLITE_STATIC );
- Source_Ref src( pkg->source() );

- string surl = src.url().asString();
- const char *location = pkg->location().asString().c_str();
- if (location[0] == '.' && location[1] == '/') location += 2; // strip leading "./"
+ const char *package_url = pkg->location().asString().c_str();
+ if (package_url[0] == '.' && package_url[1] == '/') package_url += 2; // strip leading "./"

- if (zmd_owned)
- {
-// DBG << "Source " << src << ", url " << src.url() << " is zmd owned" << endl;
- surl += "/";
- surl += location;
- location = NULL; // zmd knows how to get the package
- }
- else {
-// DBG << "Source " << src << ", url " << src.url() << " is zypp owned, location " << location << endl;
- }
- sqlite3_bind_text( handle, 5, surl.c_str(), -1, SQLITE_STATIC );
- sqlite3_bind_text( handle, 6, location, -1, SQLITE_STATIC ); // package_filename, NULL for zmd owned sources
+ sqlite3_bind_text( handle, 5, package_url, -1, SQLITE_STATIC );
+ sqlite3_bind_text( handle, 6, zmd_owned ? NULL : "", -1, SQLITE_STATIC );

sqlite3_bind_text( handle, 7, NULL, -1, SQLITE_STATIC ); // signature_filename
sqlite3_bind_int( handle, 8, pkg->size() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc new/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc
--- old/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc 2006-04-07 14:33:55.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/dbsource/DbPackageImpl.cc 2006-05-04 22:42:53.000000000 +0200
@@ -65,11 +65,21 @@
text = (const char *) sqlite3_column_text( handle, 13 );
if (text != NULL)
_description = TranslatedText( string( text ) );
- text = (const char *) sqlite3_column_text( handle, 14 );
- if (text != NULL)
- _location = Pathname( text );
- _install_only = (sqlite3_column_int( handle, 15 ) != 0);
- _media_nr = sqlite3_column_int( handle, 16 );
+ text = (const char *) sqlite3_column_text( handle, 15 ); // package_filename
+ if (text != NULL
+ && *text != 0)
+ {
+ _location = Pathname( text ); // if set, use this (zmd owned source)
+ }
+ else {
+ text = (const char *)sqlite3_column_text( handle, 14 ); // else use package_url
+ if (text == NULL)
+ ERR << "package_url NULL for id " << id << endl;
+ else
+ _location = Pathname( text );
+ }
+ _install_only = (sqlite3_column_int( handle, 16 ) != 0);
+ _media_nr = sqlite3_column_int( handle, 17 );

return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbSourceImpl.cc new/zmd-backend-7.1.1.0/src/dbsource/DbSourceImpl.cc
--- old/zmd-backend-7.1.1.0/src/dbsource/DbSourceImpl.cc 2006-04-28 14:18:13.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/dbsource/DbSourceImpl.cc 2006-05-04 22:43:00.000000000 +0200
@@ -208,9 +208,9 @@
" installed_size, catalog,"
// 8 9 10 11
" installed, local, rpm_group, file_size,"
- // 12 13 14
- " summary, description, package_filename,"
- // 15 16
+ // 12 13 14 15
+ " summary, description, package_url, package_filename,"
+ // 16 17
" install_only, media_nr "
"FROM packages "
"WHERE catalog = ?";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/resolve-dependencies.cc new/zmd-backend-7.1.1.0/src/resolve-dependencies.cc
--- old/zmd-backend-7.1.1.0/src/resolve-dependencies.cc 2006-04-25 16:29:39.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/resolve-dependencies.cc 2006-05-04 10:31:48.000000000 +0200
@@ -44,10 +44,11 @@

if (debug || info->important()) {
if (debug && info->error())
- cerr << "ERR ";
+ cout << "ERR ";
if (debug && info->important())
- cerr << "IMP ";
+ cout << "IMP ";
cout << info->message() << endl;
+ WAR << info->message() << endl;
}
return;
}


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



Remember to have fun...


< Previous Next >