Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2010-12-15 10:32:17 (GMT)
committer Simon Schampijer <simon@schampijer.de>2010-12-15 10:32:17 (GMT)
commitb2713910093ee423aec442312415f0e53ccbe818 (patch)
tree12ec1520faf9ad2d0e613f4926cb77b18840c816
parentba35611c1623340c74a591e8460a8ea20ca34db7 (diff)
parent9812b82512a82ff52df5252b3e3cf0720cce7e2d (diff)
Merge branch 'sucrose-0.84' of gitorious@git.sugarlabs.org:sugar/mainline into sucrose-0.84
-rw-r--r--src/jarabe/journal/model.py2
1 files changed, 1 insertions, 1 deletions
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)