Merge with bugfix-0.5 master

file:e245e6a9c7ec529deb6d559f7f540439675b03ab -> file:da7e8d04a3b803b1ac5a699d94960626753299ca
--- a/README
+++ b/README
@@ -2,6 +2,7 @@
mp3togo
(C) 2004 - 2007 Simeon Veldstra <reallifesim@gmail.com>
+http://puddle.ca/mp3togo/
INSTALLING
file:f47363a5db92f45b8b1fb44ab6513869c5245dfb -> file:d9d18eb16e46bca128c4ae1eefd29fef0be02d79
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mp3togo (0.5.13) unstable; urgency=low
+
+ * Changed default verbosity to 2.
+ Cleaned up cluster.py.
+
+ -- Simeon Veldstra <reallifesim@gmail.com> Thu, 03 Apr 2008 13:39:53 -0700
+
mp3togo (0.5.12) unstable; urgency=low
* Fixed eyeD3 to work without ID3 present.
file:7ffd3478a26391dbcab528c048f9b0655344a9df -> file:244d893cc528303076b3e241cb2b9c03364ff8c6
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Simeon Veldstra <reallifesim
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-support (>=0.5.2)
#Build-Depends-Indep: python, python-support (>=0.5.3), docbook-to-man
Build-Depends-Indep: docbook-to-man
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+#XS-Python-Version: current
Package: mp3togo
Architecture: all
-#XS-Python-Version: current
#XB-Python-Version: ${python:Versions}
Depends: ${python:Depends}, python-pyvorbis, python-eyeD3, mpg321, vorbis-tools
#Provides: ${python:Provides}
file:b0072736f0b1ebc3e5f0867bac438b0e3154b5c7 -> file:6cfe823d1016fb52d0c63f28295d7dda08bb2122
--- 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, Mon 11 Jun 2007, 19:51
+.\" created by instant / docbook-to-man, Thu 03 Apr 2008, 13:45
file:14277acd53b89c4bc1bdd5a306b2a8fd29ddec69 -> file:99fbed9875d1072369eb090a3392214150d6e258
--- a/mp3togo/cluster.py
+++ b/mp3togo/cluster.py
@@ -93,7 +93,6 @@ def slave(opts):
fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) #Want
- #fcntl.fcntl(sys.stdout.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) #Don't
def initialize(ropts):
"""Integrate remote options into local opts"""
@@ -240,8 +239,6 @@ class Boss:
def poll(self):
start = 0
last_action = ''
- #for key in self.opts.keys():
- # self.wf.write('%s=%s\n' % (key, self.opts[key]))
optd = self.opts._d.copy()
optd['arg_files'] = []
st = "pickle=" + cPickle.dumps(optd) + '\n'
file:5187fd7c21c1e1812e888cf663ff8d7a16026a71 -> file:a5bd5724eab2bb02d83ff46a618f66880ddc1c63
--- a/mp3togo/options.py
+++ b/mp3togo/options.py
@@ -77,7 +77,7 @@ interface.
'''Write out a new config file with the options given and exit. To save the configuration to a different file, set --config to the desired filename. The file, if it exists, will be overwritten.'''),
('noconffile', '', 'no-config-file', False, self._noconffile,
'''Disable reading from and writing to the config file.'''),
- ('verbosity', 'v', 'verbose', 1, self._verbosity,
+ ('verbosity', 'v', 'verbose', 2, self._verbosity,
'''Set the verbosity level. A value of 0 will produce no output (except option parsing errors).'''),
('help', 'h', 'help', False, self._help,
'''Print this message.'''),