From 9812b82512a82ff52df5252b3e3cf0720cce7e2d Mon Sep 17 00:00:00 2001
From: James Cameron <quozl@laptop.org>
Date: Wed, 15 Dec 2010 05:21:08 +0000
Subject: Merge branch 'sucrose-0.84' of git.sugarlabs.org:sugar/mainline into sucrose-0.84

Conflicts:
	src/jarabe/journal/model.py
---
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index a93321e..8ba13d6 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -22,6 +22,7 @@ import time
 import shutil
 import tempfile
 from stat import S_IFLNK, S_IFMT, S_IFDIR, S_IFREG
+import traceback
 import re
 import json
 from gettext import gettext as _
@@ -347,7 +348,6 @@ class InplaceResultSet(BaseResultSet):
 
     def _scan_a_file(self):
         full_path = self._pending_files.pop(0)
-        metadata = None
 
         try:
             stat = os.lstat(full_path)
--
cgit v0.9.1