Gracefully handle failed libreoffice read/writes (LP: #1557744)
This commit is contained in:
parent
babc8775ce
commit
8404d4b559
|
@ -270,8 +270,8 @@ class MugshotWindow(Window):
|
||||||
self.initials = user_details['initials']
|
self.initials = user_details['initials']
|
||||||
self.home_phone = user_details['home_phone']
|
self.home_phone = user_details['home_phone']
|
||||||
self.office_phone = user_details['office_phone']
|
self.office_phone = user_details['office_phone']
|
||||||
email = user_details['email']
|
self.email = user_details['email']
|
||||||
fax = user_details['fax']
|
self.fax = user_details['fax']
|
||||||
|
|
||||||
# Populate the GtkEntries.
|
# Populate the GtkEntries.
|
||||||
logger.debug('Populating entries')
|
logger.debug('Populating entries')
|
||||||
|
@ -280,8 +280,8 @@ class MugshotWindow(Window):
|
||||||
self.initials_entry.set_text(self.initials)
|
self.initials_entry.set_text(self.initials)
|
||||||
self.office_phone_entry.set_text(self.office_phone)
|
self.office_phone_entry.set_text(self.office_phone)
|
||||||
self.home_phone_entry.set_text(self.home_phone)
|
self.home_phone_entry.set_text(self.home_phone)
|
||||||
self.email_entry.set_text(email)
|
self.email_entry.set_text(self.email)
|
||||||
self.fax_entry.set_text(fax)
|
self.fax_entry.set_text(self.fax)
|
||||||
|
|
||||||
# = Mugshot Window ====================================================== #
|
# = Mugshot Window ====================================================== #
|
||||||
def set_user_image(self, filename=None):
|
def set_user_image(self, filename=None):
|
||||||
|
@ -760,6 +760,15 @@ class MugshotWindow(Window):
|
||||||
'home_phone': '', 'office_phone': '', 'fax': ''}
|
'home_phone': '', 'office_phone': '', 'fax': ''}
|
||||||
if os.path.isfile(prefs_file):
|
if os.path.isfile(prefs_file):
|
||||||
logger.debug('Getting settings from %s' % prefs_file)
|
logger.debug('Getting settings from %s' % prefs_file)
|
||||||
|
|
||||||
|
# Check for file access
|
||||||
|
try:
|
||||||
|
prefs = open(prefs_file, 'r')
|
||||||
|
prefs.close()
|
||||||
|
except PermissionError:
|
||||||
|
logger.debug('Reject: Cannot open file.')
|
||||||
|
return data
|
||||||
|
|
||||||
for line in open(prefs_file):
|
for line in open(prefs_file):
|
||||||
if "UserProfile/Data" in line:
|
if "UserProfile/Data" in line:
|
||||||
try:
|
try:
|
||||||
|
@ -820,6 +829,15 @@ class MugshotWindow(Window):
|
||||||
fax = get_entry_value(self.fax_entry)
|
fax = get_entry_value(self.fax_entry)
|
||||||
fax_updated = False
|
fax_updated = False
|
||||||
tmp_buffer = []
|
tmp_buffer = []
|
||||||
|
|
||||||
|
# Check for file access
|
||||||
|
try:
|
||||||
|
prefs = open(prefs_file, 'a')
|
||||||
|
prefs.close()
|
||||||
|
except PermissionError:
|
||||||
|
logger.debug('Reject: Not updating.')
|
||||||
|
return
|
||||||
|
|
||||||
for line in open(prefs_file):
|
for line in open(prefs_file):
|
||||||
new = None
|
new = None
|
||||||
if "UserProfile/Data" in line:
|
if "UserProfile/Data" in line:
|
||||||
|
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2016-03-27 22:09-0400\n"
|
"POT-Creation-Date: 2016-03-27 22:26-0400\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
@ -141,11 +141,11 @@ msgid ""
|
||||||
"to your personal information."
|
"to your personal information."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../mugshot/MugshotWindow.py:802
|
#: ../mugshot/MugshotWindow.py:811
|
||||||
msgid "Update LibreOffice user details?"
|
msgid "Update LibreOffice user details?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../mugshot/MugshotWindow.py:803
|
#: ../mugshot/MugshotWindow.py:812
|
||||||
msgid "Would you also like to update your user details in LibreOffice?"
|
msgid "Would you also like to update your user details in LibreOffice?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue