Freeze exception for rdiff-backup 1.2.0-1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
rdiff-backup version 1.2.0-1 has, apart from a python cosmetic change,
nothing new, but it is the first release of the 1.2.x stable series.
The upstream change between 1.1.17 and 1.2.0 can be seen here (there are
no other changes done that in 1.2.0-1, except debian/changelog):
http://git.debian.net/?p=rdiff-backup.git;a=commitdiff;h=114b10340427cfabcadc2b96274463dbd0c72cf2
It would be very nice to have it in lenny in order to no longer confuse
users wrt/ using different rdiff-backup versions on the server and on
the client (see #426110 for some information about that).
However, for everyone's convenince, I also attached the same information
again as debdiff between 1.1.17-1 and 1.2.0-1.
Regards,
Daniel
- --
Address: Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email: daniel.baumann@panthera-systems.net
Internet: http://people.panthera-systems.net/~daniel-baumann/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkiVtGwACgkQ+C5cwEsrK57hrQCg4C3GrpJynE7OX0unVTzv+dup
mwsAn0NUz91CKdgfIwV4wTsT8Pgzv83l
=UfsN
-----END PGP SIGNATURE-----
diff --git a/CHANGELOG b/CHANGELOG
index 6b6dcae..feed2a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+New in v1.2.0 (2008/07/27)
+---------------------------
+
+Fall back on the Python make_file_dict function when the filename contains
+non-ASCII characters. (Andrew Ferguson)
+
+Ignore Extended Attributes which have Unicode characters outside the current
+system representation. These will be correctly handled when rdiff-backup
+switches to Python 3, which will have full Unicode support. (Andrew Ferguson)
+
+
New in v1.1.17 (2008/07/17)
---------------------------
diff --git a/debian/changelog b/debian/changelog
index 8d8bee0..35cd970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rdiff-backup (1.2.0-1) unstable; urgency=medium
+
+ * Merging upstream version 1.2.0
+ (Closes: #345627, #420869, #426110, #443686, #463035, #480785, #481098).
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 31 Jul 2008 22:27:00 +0200
+
rdiff-backup (1.1.17-1) unstable; urgency=low
* Merging upstream version 1.1.17 (Closes: #491185):
diff --git a/rdiff-backup b/rdiff-backup
index e210450..e28bbee 100644
--- a/rdiff-backup
+++ b/rdiff-backup
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# rdiff-backup -- Mirror files while keeping incremental changes
-# Version 1.1.17 released July 17, 2008
+# Version 1.2.0 released July 27, 2008
# Copyright (C) 2001-2005 Ben Escoto <rdiff-backup@emerose.org>
#
# This program is licensed under the GNU General Public License (GPL).
diff --git a/rdiff-backup-statistics b/rdiff-backup-statistics
index c476049..fb08a68 100644
--- a/rdiff-backup-statistics
+++ b/rdiff-backup-statistics
@@ -1,6 +1,6 @@
#!/usr/bin/python
# rdiff-backup-statistics -- Summarize rdiff-backup statistics files
-# Version 1.1.17 released July 17, 2008
+# Version 1.2.0 released July 27, 2008
# Copyright 2005 Dean Gaudet, Ben Escoto
#
# This file is part of rdiff-backup.
diff --git a/rdiff-backup-statistics.1 b/rdiff-backup-statistics.1
index a3108e7..d421b29 100644
--- a/rdiff-backup-statistics.1
+++ b/rdiff-backup-statistics.1
@@ -1,4 +1,4 @@
-.TH RDIFF-BACKUP 1 "July 2008" "Version 1.1.17" "User Manuals"
+.TH RDIFF-BACKUP 1 "July 2008" "Version 1.2.0" "User Manuals"
.SH NAME
rdiff-backup-statistics \- summarize rdiff-backup statistics files
.SH SYNOPSIS
diff --git a/rdiff-backup.1 b/rdiff-backup.1
index 9c059aa..a968ede 100644
--- a/rdiff-backup.1
+++ b/rdiff-backup.1
@@ -1,4 +1,4 @@
-.TH RDIFF-BACKUP 1 "July 2008" "Version 1.1.17" "User Manuals"
+.TH RDIFF-BACKUP 1 "July 2008" "Version 1.2.0" "User Manuals"
.SH NAME
rdiff-backup \- local/remote mirror and incremental backup
.SH SYNOPSIS
diff --git a/rdiff-backup.spec b/rdiff-backup.spec
index 76a76cc..9d8d2f9 100644
--- a/rdiff-backup.spec
+++ b/rdiff-backup.spec
@@ -2,7 +2,7 @@
%define PYTHON_VERSION %(%{PYTHON_NAME} -c 'import sys; print sys.version[:3],')
%define NEXT_PYTHON_VERSION %(%{PYTHON_NAME} -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),')
-Version: 1.1.17
+Version: 1.2.0
Summary: Convenient and transparent local/remote incremental mirror/backup
Name: rdiff-backup
Release: 1
diff --git a/rdiff-backup.spec-fedora b/rdiff-backup.spec-fedora
index a1546ef..5c2bf0f 100644
--- a/rdiff-backup.spec-fedora
+++ b/rdiff-backup.spec-fedora
@@ -1,7 +1,7 @@
%define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],')
%define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),')
-Version: 1.1.17
+Version: 1.2.0
Summary: Convenient and transparent local/remote incremental mirror/backup
Name: rdiff-backup
Release: 0.fdr.1
diff --git a/rdiff_backup/Globals.py b/rdiff_backup/Globals.py
index b6445f0..729ab45 100644
--- a/rdiff_backup/Globals.py
+++ b/rdiff_backup/Globals.py
@@ -23,7 +23,7 @@ import re, os
# The current version of rdiff-backup
-version = "1.1.17"
+version = "1.2.0"
# If this is set, use this value in seconds as the current time
# instead of reading it from the clock.
diff --git a/rdiff_backup/eas_acls.py b/rdiff_backup/eas_acls.py
index 6b1e128..856b700 100644
--- a/rdiff_backup/eas_acls.py
+++ b/rdiff_backup/eas_acls.py
@@ -150,7 +150,11 @@ def EA2Record(ea):
if not val: str_list.append(name)
else:
encoded_val = base64.encodestring(val).replace('\n', '')
- str_list.append('%s=0s%s' % (C.acl_quote(name), encoded_val))
+ try:
+ str_list.append('%s=0s%s' % (C.acl_quote(name), encoded_val))
+ except UnicodeEncodeError:
+ log.Log("Warning: unable to store Unicode extended attribute %s"
+ % repr(name), 3)
return '\n'.join(str_list)+'\n'
def Record2EA(record):
diff --git a/rdiff_backup/rpath.py b/rdiff_backup/rpath.py
index ec276d4..0dadd43 100644
--- a/rdiff_backup/rpath.py
+++ b/rdiff_backup/rpath.py
@@ -273,9 +273,14 @@ def make_file_dict(filename):
(incomplete) rpath object.
"""
if os.name != 'nt':
- return C.make_file_dict(filename)
- else:
- return make_file_dict_python(filename)
+ try:
+ return C.make_file_dict(filename)
+ except OSError, error:
+ # Unicode filenames should be process by the Python version
+ if error.errno != errno.EILSEQ and error.errno != errno.EINVAL:
+ raise
+
+ return make_file_dict_python(filename)
def make_file_dict_python(filename):
"""Create the data dictionary using a Python call to os.lstat
diff --git a/setup.py b/setup.py
index 9b1f4d8..f76abb8 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
import sys, os, getopt
from distutils.core import setup, Extension
-version_string = "1.1.17"
+version_string = "1.2.0"
if sys.version_info[:2] < (2,2):
print "Sorry, rdiff-backup requires version 2.2 or later of python"
Reply to: