commit libzypp-zmd-backend

31 May 2006

Hello community,

here is the log from the commit of package libzypp-zmd-backend
checked in at Wed May 31 17:10:55 CEST 2006.

--------

--- libzypp-zmd-backend/libzypp-zmd-backend.changes	2006-05-30 12:45:12.000000000 +0200
+++ libzypp-zmd-backend/libzypp-zmd-backend.changes	2006-05-31 14:02:56.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 31 10:29:21 CEST 2006 - kkaempf@suse.de
+
+- fall back to source URL if no product available (#179875)
+- refresh remote, zypp-owned sources (#178334)
+- rev 3469
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.L0bLCL/_old	2006-05-31 17:10:15.000000000 +0200
+++ /var/tmp/diff_new_pack.L0bLCL/_new	2006-05-31 17:10:15.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:        48
+Release:        49
 Source:         zmd-backend-%{version}.tar.bz2
 Prefix:         /usr
 
@@ -68,6 +68,10 @@
 /etc/logrotate.d/zmd-backend
 
 %changelog -n libzypp-zmd-backend
+* Wed May 31 2006 - kkaempf@suse.de
+- fall back to source URL if no product available (#179875)
+- refresh remote, zypp-owned sources (#178334)
+- rev 3469
 * Tue May 30 2006 - kkaempf@suse.de
 - re-enable callback (r3398, r3425) based on environment variable
   "KEYRING_CALLBACK" set by ZMD (#173920)

++++++ 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/MediaChangeCallback.h new/zmd-backend-7.1.1.0/src/MediaChangeCallback.h
--- old/zmd-backend-7.1.1.0/src/MediaChangeCallback.h	2006-05-12 12:13:26.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/MediaChangeCallback.h	2006-05-31 10:27:32.000000000 +0200
@@ -67,11 +67,15 @@
 		    }	
 		}
 
+		// fall back to source url if source does not provide a product
 		if (product_name.empty()) {
-		    product_name = description;
+		    product_name = source.url().asString();
 		}
 
 		std::cout << "|" << product_name << std::endl;
+
+		// FIXME: prodive additonal details about WHY a media change is requested
+		// std::cout << "|" << description;
 	    }
 
 	    // and abort here.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/parse-metadata.cc new/zmd-backend-7.1.1.0/src/parse-metadata.cc
--- old/zmd-backend-7.1.1.0/src/parse-metadata.cc	2006-05-18 12:39:05.000000000 +0200
+++ new/zmd-backend-7.1.1.0/src/parse-metadata.cc	2006-05-31 14:00:26.000000000 +0200
@@ -245,7 +245,14 @@
 	    }
 	}
 	else if (urialias == it->alias()) {			// urialias matches zypp one
+
 	    MIL << "Found alias, source already known to zypp" << endl;
+
+	    if (it->remote()) {
+		Source_Ref source = manager->findSource( it->numericId() );	// get non-const reference
+		source.refresh();			// refresh zypp-owned remote source
+	    }
+
 	    sync_source( db, *it, catalog, Url(), owner );	// known by alias
 	    break;
 	}


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)