diff options
| author | James Cameron <quozl@laptop.org> | 2010-12-15 05:21:08 (GMT) |
|---|---|---|
| committer | James Cameron <quozl@laptop.org> | 2010-12-15 05:21:08 (GMT) |
| commit | 9812b82512a82ff52df5252b3e3cf0720cce7e2d (patch) | |
| tree | 86fe445e96dff8d24af6c48a7ccb30aa8f4ee492 | |
| parent | c7f625e951df6b679092058b267e86c77b9f04a8 (diff) | |
| parent | 94574ebd1c05783f455712d5ab13f537e2ab9739 (diff) | |
Merge branch 'sucrose-0.84' of git.sugarlabs.org:sugar/mainline into sucrose-0.84
Conflicts:
src/jarabe/journal/model.py
| -rw-r--r-- | src/jarabe/journal/model.py | 2 |
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) |