Final changes for 1.1.3

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

trunk/rdiff-backup/CHANGELOG

-New in v1.1.3 (????/??/??)
+New in v1.1.3 (2005/11/25)
 --------------------------
 
 Regression metadata bug introduced with 1.1.1/1.1.2 fixed.

trunk/rdiff-backup/rdiff_backup/longname.py

@@ -250,11 +250,11 @@ def update_rf(rf, rorp, mirror_root):
 		"""Make a new rf when long name info is available"""
 		if rorp.has_alt_mirror_name():
 			inc_name = rorp.get_alt_mirror_name()
-			mirror_rp = get_long_rp(mirror_name)
-		elif rorp.has_alt_inc_name():
-			inc_name = rorp.get_alt_inc_name()
+			mirror_rp = get_long_rp(inc_name)
+		else:
 			mirror_rp = mirror_root.new_index(rorp.index)
-		else: assert 0, "Making new rf when rorp has no alternate name info"
+			if rorp.has_alt_inc_name(): inc_name = rorp.get_alt_inc_name()
+			else: return restore.RestoreFile(mirror_rp, None, [])
 
 		rf = restore.RestoreFile(mirror_rp, None, [])
 		update_incs(rf, inc_name)

trunk/rdiff-backup/testing/metadatatest.py

 import unittest, os, cStringIO, time
-from rdiff_backup.metadata import *
 from rdiff_backup import rpath, connection, Globals, selection, lazy
+from rdiff_backup.metadata import *
 
 tempdir = rpath.RPath(Globals.local_connection, "testfiles/output")