From: Simeon Veldstra <reallifesim@gmail.com>
Date: Thu, 3 Apr 2008 21:48:30 +0000 (-0700)
Subject: Merge with bugfix-0.5
X-Git-Url: http://puddle.ca/cgi-bin/gitweb.cgi?p=mp3togo;a=commitdiff;h=7cfebced7ca5b0c9e53e754b01c5cbae006cc879

Merge with bugfix-0.5
---

--- a/README
+++ b/README
@@ -2,6 +2,7 @@
 mp3togo
 
 (C) 2004 - 2007 Simeon Veldstra <reallifesim@gmail.com>
+http://puddle.ca/mp3togo/
 
 INSTALLING
 
--- 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. 
--- 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}
--- 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 
--- 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'
--- 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.'''),