Final changes for 0.12.2

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@368 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

branches/r0-12/rdiff-backup/CHANGELOG

-New in v0.12.2 (2003/08/??)
+New in v0.12.2 (2003/07/24)
 ---------------------------
 
 Patch by Arkadiusz Patyk fixes building with Python 2.3c1.

branches/r0-12/rdiff-backup/dist/makerpm

@@ -14,7 +14,7 @@ else:
 
 base = "rdiff-backup-%s" % (version,)
 tarfile = base + ".tar.gz"
-rpmbase = base + "-0.fdr.1" # Fedora suffix, with release number 1
+rpmbase = base + "-0.fdr.2" # Fedora suffix, with release number 2
 i386_rpm = rpmbase + ".i386.rpm"
 source_rpm = rpmbase + ".src.rpm"
 

branches/r0-12/rdiff-backup/dist/rdiff-backup.spec.template

@@ -3,7 +3,7 @@
 Version: $version
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
-Release: 0.fdr.1
+Release: 0.fdr.2
 Epoch: 0
 URL: http://rdiff-backup.stanford.edu/
 Source: http://rdiff-backup.stanford.edu/%{name}-%{version}.tar.gz
@@ -11,7 +11,7 @@ License: GPL
 Group: Applications/Archiving
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: librsync >= 0.9.5.1, %{PYTHON_NAME} >= 2.2
-BuildPrereq: %{PYTHON_NAME}-devel >= 2.2, librsync-devel >= 0.9.5.1
+BuildPrereq: %{PYTHON_NAME}-devel >= 2.2, librsync-devel = 0.9.5.1
 
 %description
 rdiff-backup is a script, written in Python, that backs up one
@@ -45,6 +45,10 @@ differences from the previous backup will be transmitted.
 %doc CHANGELOG COPYING FAQ.html README
 
 %changelog
+* Thu Jul 24 2003 Ben Escoto <bescoto@stanford.edu>
+- Set librsync = 0.9.5.1, because new version will use librsync.h
+  instead of rsync.h
+
 * Sun Jul 20 2003 Ben Escoto <bescoto@stanford.edu>
 - Minor changes to comply with Fedora standards.
 

branches/r0-12/rdiff-backup/rdiff_backup/regress.py

@@ -140,13 +140,15 @@ def iterate_meta_rfs(mirror_rp, inc_rp):
 	raw_rfs = iterate_raw_rfs(mirror_rp, inc_rp)
 	collated = rorpiter.Collate2Iters(raw_rfs, yield_metadata())
 	for raw_rf, metadata_rorp in collated:
-		if not raw_rf:
+		if raw_rf:
+			raw_rf.set_metadata_rorp(metadata_rorp)
+			yield raw_rf
+		else:
 			log.Log("Warning, metadata file has entry for %s,\n"
 					"but there are no associated files." %
 					(metadata_rorp.get_indexpath(),), 2)
-			continue
-		raw_rf.set_metadata_rorp(metadata_rorp)
-		yield raw_rf
+			yield RegressFile(mirror_rp.new_index(metadata_rorp.index),
+							  inc_rp.new_index(metadata_rorp.index), ())
 
 
 class RegressFile(restore.RestoreFile):