From: Simeon Veldstra <reallifesim@gmail.com>
Date: Thu, 3 Apr 2008 21:30:25 +0000 (-0700)
Subject: Update Debian packaging
X-Git-Tag: v0.5.13
X-Git-Url: http://puddle.ca/cgi-bin/gitweb.cgi?p=mp3togo;a=commitdiff;h=0f8554dc1c5def18f2e0fbf8d5bc9a9aa2e57909

Update Debian packaging
---

--- 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,26 +93,12 @@ 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"""
-	#	of = file('/home/sim/temp/2go/cluster/opts-slave', 'w')
-#		for key in ropts.keys():
-#			if opts.has_key(key):
-#				opts[key] = ropts[key]
-#	#			of.write("%s: %s\n" % (key, opts[key]))
-#			else:
-#				return None
-	#	of.close()
 		st = ropts['pickle']
 		opts._d = cPickle.loads(st)
-
 		opts['verbosity'] = 0
-		of = file('/home/sim/temp/2go/cluster/opts-slave', 'w')
-		for key in opts.keys():
-			of.write("%s: %s\n" % (key, opts[key]))
-		of.close()
 		return "SLAVE: ready"
 
 	def perform(rotps):
@@ -222,7 +208,6 @@ class Boss:
 		if self.pid == 0:
 			args = r_schema.replace('%h', host)
 			args += " mp3togo --cluster-slave True"
-			#args += " test-mp3togo --cluster-slave True"
 			args = args.split()
 			os.execvp(args[0], args)
 		else:
@@ -245,8 +230,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'