diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-07-25 05:58:43 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-07-25 05:58:43 +0000 |
| commit | 25fd648ab89d794f48f5c1ce8800aeabcb118d21 (patch) | |
| tree | ef8755eab93df3c9bc2b046b8198cfebe4a4410d | |
| parent | 39d57e6d23df6e43650791ee6667cec36a9a5f1d (diff) | |
| download | rdiff-backup-25fd648ab89d794f48f5c1ce8800aeabcb118d21.tar.gz | |
Final changes for 0.12.2
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r0-12@368 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rwxr-xr-x | rdiff-backup/dist/makerpm | 2 | ||||
| -rw-r--r-- | rdiff-backup/dist/rdiff-backup.spec.template | 8 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/regress.py | 10 |
4 files changed, 14 insertions, 8 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index c0d4abe..ef2143c 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,4 +1,4 @@ -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. diff --git a/rdiff-backup/dist/makerpm b/rdiff-backup/dist/makerpm index 25fee1f..bdc3060 100755 --- a/rdiff-backup/dist/makerpm +++ b/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" diff --git a/rdiff-backup/dist/rdiff-backup.spec.template b/rdiff-backup/dist/rdiff-backup.spec.template index 0249336..47c2ce7 100644 --- a/rdiff-backup/dist/rdiff-backup.spec.template +++ b/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. diff --git a/rdiff-backup/rdiff_backup/regress.py b/rdiff-backup/rdiff_backup/regress.py index 4246431..883c609 100644 --- a/rdiff-backup/rdiff_backup/regress.py +++ b/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): |