Door file problem, GPL update

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

3 files changed, 17 insertions, 5 deletions

diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 42e0058..807081e 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -6,6 +6,9 @@ Patch by Arkadiusz Patyk fixes building with Python 2.3c1.
 Restore of archives made by 0.10.x and earlier fixed, although hard
 link information is not restored.  (Bug reported by Jeff Lessem.)
 
+Fixed problem with door files locally when repository is remote.
+(Reported by Robert Weber.)
+
 
 New in v0.12.1 (2003/07/22)
 ---------------------------
diff --git a/rdiff-backup/rdiff_backup/_librsyncmodule.c b/rdiff-backup/rdiff_backup/_librsyncmodule.c
index 7a78580..92a31f0 100644
--- a/rdiff-backup/rdiff_backup/_librsyncmodule.c
+++ b/rdiff-backup/rdiff_backup/_librsyncmodule.c
@@ -1,14 +1,23 @@
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 2002 Ben Escoto
+ *   Copyright 2002 2003 Ben Escoto
  *
  *   This file is part of rdiff-backup.
  *
  *   rdiff-backup is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License as
- *   published by the Free Software Foundation, Inc., 675 Mass Ave,
- *   Cambridge MA 02139, USA; either version 2 of the License, or (at
- *   your option) any later version; incorporated herein by reference.
+ *   published by the Free Software Foundation; either version 2 of
+ *   the License, or (at your option) any later version.
+ *
+ *   rdiff-backup is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *   General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with rdiff-backup; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *   02111-1307 USA
  *
  * ----------------------------------------------------------------------- */
 
diff --git a/rdiff-backup/rdiff_backup/log.py b/rdiff-backup/rdiff_backup/log.py
index 53126e5..7d4b9be 100644
--- a/rdiff-backup/rdiff_backup/log.py
+++ b/rdiff-backup/rdiff_backup/log.py
@@ -248,7 +248,7 @@ or within one second of each other.  Wait a second and try again.""" %
 		"""Call cls.write(...) if error log open, only log otherwise"""
 		if not Globals.isbackup_writer:
 			return Globals.backup_writer.log.ErrorLog.write_if_open(
-				error_type, rp, exc)
+				error_type, rp, str(exc)) # convert exc bc of exc picking prob
 		if cls.isopen(): cls.write(error_type, rp, exc)
 		else: Log(cls.get_log_string(error_type, rp, exc), 2)