aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components
diff options
context:
space:
mode:
authorMladen Horvat <acid-burn@opendreambox.org>2011-04-13 16:17:43 +0200
committerMladen Horvat <acid-burn@opendreambox.org>2011-04-13 16:17:43 +0200
commit8a21c8eebc037850431ac627061e46e48e93a0ec (patch)
tree16ea09f5e26546a98106bbf044575894037aa6e5 /lib/python/Components
parentc3c412e8765520205b7cf8413ddf8abca74f1bc3 (diff)
parent348cf0e4d7fa1e615635984c9325fc0e8fa4e72b (diff)
downloadenigma2-8a21c8eebc037850431ac627061e46e48e93a0ec.tar.gz
enigma2-8a21c8eebc037850431ac627061e46e48e93a0ec.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2 into acid-burn/network_changes_next
Diffstat (limited to 'lib/python/Components')
-rwxr-xr-xlib/python/Components/PluginComponent.py1
-rwxr-xr-xlib/python/Components/config.py9
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index c6ad584f..b06246b2 100755
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -49,7 +49,6 @@ class PluginComponent:
directory_category = directory + c
if not os_path.isdir(directory_category):
continue
- open(directory_category + "/__init__.py", "a").close()
for pluginname in os_listdir(directory_category):
path = directory_category + "/" + pluginname
if os_path.isdir(path):
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 6e560857..5507cae9 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1661,9 +1661,12 @@ class Config(ConfigSubsection):
def saveToFile(self, filename):
text = self.pickle()
- f = open(filename, "w")
- f.write(text)
- f.close()
+ try:
+ f = open(filename, "w")
+ f.write(text)
+ f.close()
+ except IOError:
+ print "Config: Couldn't write %s" % filename
def loadFromFile(self, filename, base_file=False):
f = open(filename, "r")