Added Justus Pendleton's config file patch.
Fixed bug in cluster.py starting slaves.
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mp3togo (0.5.3) unstable; urgency=low
+
+ * Added Justus Pendleton's patch to fix config file bug.
+ * Fixed cluster mode - start slave as test-mp3togo bug.
+ * Made minor changes to prepare for GUI.
+
+ -- Simeon Veldstra <reallifesim@gmail.com> Tue, 6 Jun 2006 19:12:58 -0700
+
mp3togo (0.5.2) unstable; urgency=low
* Added Justus Pendleton's .m4a patch
--- a/debian/mp3togo.1
+++ b/debian/mp3togo.1
@@ -134,4 +134,4 @@ License can be found in /usr/share/commo
.PP
mp3togo can be found online at http://puddle.ca/mp3togo
-.\" created by instant / docbook-to-man, Wed 31 May 2006, 18:03
+.\" created by instant / docbook-to-man, Tue 06 Jun 2006, 19:24
--- a/mp3togo/cluster.py
+++ b/mp3togo/cluster.py
@@ -221,8 +221,8 @@ class Boss:
self.pid, self.fd1 = pty.fork()
if self.pid == 0:
args = r_schema.replace('%h', host)
- #args += " mp3togo --cluster-slave True"
- args += " test-mp3togo --cluster-slave True"
+ args += " mp3togo --cluster-slave True"
+ #args += " test-mp3togo --cluster-slave True"
args = args.split()
os.execvp(args[0], args)
else:
--- a/mp3togo/conf.py
+++ b/mp3togo/conf.py
@@ -73,7 +73,7 @@ class Options(options.Options):
"""Subclass options.Options and fill in application specific
information."""
def __init__(self, argv=None, conffile=None, readconf=True):
- options.Options.__init__(self, '~/mp3togo')
+ options.Options.__init__(self, '~/.mp3togo')
# Options to add:
# ((name, short option, long option, default value, hook, help text), ...)
--- a/mp3togo/options.py
+++ b/mp3togo/options.py
@@ -244,7 +244,8 @@ interface.
if self.opt('conffile') and self._readconf:
self._lock()
try:
- fp = file(self._d['conffile'], 'w')
+ fn = os.path.expanduser(self._d['conffile'])
+ fp = file(fn, 'w')
for key in self._d.keys():
if key in self._nosave_options:
continue