summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Wendel <h_wendel@cojobo.net>2005-05-28 21:19:33 +0000
committerHeinrich Wendel <h_wendel@cojobo.net>2005-05-28 21:19:33 +0000
commit15500102075f0904298b506a184051ed637e54e2 (patch)
tree8aee5f61ea16e53affaf42d48c3b34d57add5abf
parentf0c3b36a885b1af46452232c53bd2b931ec17cfc (diff)
fix
-rw-r--r--xdg/MenuEditor.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/xdg/MenuEditor.py b/xdg/MenuEditor.py
index d5b1f3d..1dd338a 100644
--- a/xdg/MenuEditor.py
+++ b/xdg/MenuEditor.py
@@ -264,7 +264,10 @@ class MenuEditor:
def deleteEntry(self, entry):
if entry.Type == "User":
- os.remove(entry.DesktopEntry.filename)
+ try:
+ os.remove(entry.DesktopEntry.filename)
+ except OSError:
+ pass
for parent in entry.Parents:
parent.Entries.remove(entry)
parent.DeskEntries.remove(entry)
@@ -274,7 +277,10 @@ class MenuEditor:
def revertEntry(self, entry):
if entry.Type == "Both":
- os.remove(entry.DesktopEntry.filename)
+ try:
+ os.remove(entry.DesktopEntry.filename)
+ except OSError:
+ pass
for parent in entry.Parents:
index = parent.Entries.index(entry)
parent.Entries[index] = entry.Original
@@ -285,7 +291,10 @@ class MenuEditor:
def deleteMenu(self, menu):
if self.__isUserMenu(menu) == True:
- os.remove(menu.Directory.DesktopEntry.filename)
+ try:
+ os.remove(entry.Directory.DesktopEntry.filename)
+ except OSError:
+ pass
menu.Directory = None
xml_menu = self.__getXmlMenu(menu.getPath(True, True))
xml_menu.parentNode.removeChild(xml_menu)
@@ -293,7 +302,10 @@ class MenuEditor:
def revertMenu(self, menu):
if menu.Directory.Type == "Both" or self.__isUserMenu(menu) == True:
- os.remove(menu.Directory.DesktopEntry.filename)
+ try:
+ os.remove(entry.Directory.DesktopEntry.filename)
+ except OSError:
+ pass
menu.Directory = menu.Directory.Original
sort(self.menu)
return menu