diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2009-09-18 10:31:13 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@laptop.org> | 2009-12-01 18:03:49 (GMT) |
| commit | 5ebfbd06c1d96aa8124294090dd02eaab5b70bb3 (patch) | |
| tree | fe6f9edd33d93c6124340a65a494060468cb3dee /src | |
| parent | a428022a2718a813ad88f5334341a16a07eaacf9 (diff) | |
To emulate missed parts of DSObject - optional file_path removing #1241
Diffstat (limited to 'src')
| -rw-r--r-- | src/sugar/datastore/datastore.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py index d84a7f4..d174bd4 100644 --- a/src/sugar/datastore/datastore.py +++ b/src/sugar/datastore/datastore.py @@ -168,6 +168,7 @@ class RawObject(object): def get_file_path(self, fetch=True): # we have to create symlink since its a common practice # to create hardlinks to jobject files + # and w/o this, it wouldn't work since we have file from mounted device if self._file_path is None: self._file_path = tempfile.mktemp( prefix='rawobject', @@ -183,7 +184,8 @@ class RawObject(object): return self._destroyed = True if self._file_path is not None: - os.remove(self._file_path) + if os.path.exists(self._file_path): + os.remove(self._file_path) self._file_path = None def __del__(self): @@ -194,11 +196,11 @@ class RawObject(object): def get(object_id): logging.debug('datastore.get') - metadata = dbus_helpers.get_properties(object_id) if object_id.startswith('/'): return RawObject(object_id) + metadata = dbus_helpers.get_properties(object_id) ds_object = DSObject(object_id, DSMetadata(metadata), None) # TODO: register the object for updates return ds_object |