Merge lp:~xaba/ubuntu/natty/pytrainer/bug-760885 into lp:ubuntu/natty/pytrainer

[Xavier Bassery]

Small fix to LP #760885 that renders the application unusable if no configuration file is found or if it is empty.

[Barry Warsaw (barry)]

Thanks for your patch Xavier! This seems like a reasonable fix to me. I have two questions:

* Should the log message be changed to indicate that a default configuration is going to be used?

* Now that Natty has been released, is this fix important enough to put through the SRU process?

https://wiki.ubuntu.com/StableReleaseUpdates

review: Approve

[Brian Murray (brian-murray)]

The application fails to start without a configuration file after being freshly installed so I think that is important enough to put through the SRU process.

[Brian Murray (brian-murray)]

I uploaded this to natty-proposed.

[Xavier Bassery (xaba)]

It is my pleasure Barry!
Regarding your first question, you are right that a log message should inform that a default configuration will be used.
I have added that in a new revision.

[lp:~xaba/ubuntu/natty/pytrainer/bug-760885]

12. By Xavier Bassery on 2011-05-02

log the defaut profile creation when none exists.

[Daniel Holbach (dholbach)]

All these changes have gone into -updates already. Can this merge proposal please be marked as 'merged'?

[Colin Watson (cjwatson)]

<dholbach> cjwatson, can you also mark this one as merged https://code.launchpad.net/~xaba/ubuntu/natty/pytrainer/bug-760885/+merge/58908? seems it got into natty-proposed and -updates already
<cjwatson> dholbach: the new revision mentioned at the end of the comment thread too?
<dholbach> cjwatson, hum, looks like not - I'll follow up on the merge proposal
<dholbach> cjwatson, oh no, it's included - it's just not documented in d/changelog

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-16 15:13:54 +0000
+++ debian/changelog	2011-05-02 01:49:25 +0000
@@ -1,3 +1,10 @@
+pytrainer (1.7.2-1.1ubuntu2) natty; urgency=low
+
+  * Workaround bug (LP: #760885) to let the application start even if the
+    user configuration file is not found.
+
+ -- Xavier Bassery <[e-mail]>  Sun, 24 Apr 2011 00:12:48 +0200
+
 pytrainer (1.7.2-1.1ubuntu1) natty; urgency=low
 
   * Merge from debian unstable (LP: #599457), remaining changes:

=== modified file 'pytrainer/profile.py'
--- pytrainer/profile.py	2010-05-12 15:33:22 +0000
+++ pytrainer/profile.py	2011-05-02 01:49:25 +0000
@@ -35,9 +35,9 @@
 		self.configuration = XMLParser(self.filename)
 		# Checks if configuration file is empty
 		if self.configuration.xmldoc is None:
-			logging.error("Seems no data available in local configuration file: "+self.filename+", please check")
-			logging.error("Fatal error, exiting")
-			exit(-3)
+			logging.warning("Seems no data available in local configuration file: "+self.filename+", please check")
+			logging.info("A default profile will be created")
+			self.createDefaultConf()
 		else:
 			logging.debug("Configuration retrieved: "+str(self.configuration.getOptions()))
 		logging.debug("<<")
@@ -82,7 +82,7 @@
 		logging.debug("Retrieving data from "+ self.filename)
 		self.configuration = XMLParser(self.filename)
 		#list_options.append(("version",self.version))
-		if not os.path.isfile(self.filename):
+		if not os.path.isfile(self.filename) or os.stat(self.filename).st_size == 0:
 			self.configuration.createXMLFile("pytraining",list_options)
 		for option in list_options:
 			logging.debug("Adding "+option[0]+"|"+option[1])