From bdfb1cf6432adf3efc601377e4d6d028958a26fa Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 8 Oct 2010 17:55:02 +0100
Subject: [PATCH] Take out debugging return from cli restore_db Add restore
 UUID to recover.py

---
 src/calibre/library/cli.py     | 1 -
 src/calibre/library/restore.py | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 44a7368ce1..8ba73c0bd1 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -989,7 +989,6 @@ def command_restore_database(args, dbpath):
         parser.print_help()
         return 1
 
-    return
     if opts.library_path is not None:
         dbpath = opts.library_path
 
diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py
index ab4e59a4c3..16aba3aebd 100644
--- a/src/calibre/library/restore.py
+++ b/src/calibre/library/restore.py
@@ -200,6 +200,8 @@ class Restore(Thread):
     def restore_book(self, book, db):
         db.create_book_entry(book['mi'], add_duplicates=True,
                 force_id=book['id'])
+        if book['mi'].uuid:
+            db.set_uuid(book['id'], book['mi'].uuid, commit=False, notify=False)
         db.conn.execute('UPDATE books SET path=? WHERE id=?', (book['path'],
             book['id']))