Merge lp:~robru/cupstream2distro/drop-debdiff-dir into lp:cupstream2distro

[Robert Bruce Park]

Drop ~/debdiff dir now that there is only one disk.

=== modified file 'Makefile'
--- Makefile	2015-12-09 06:12:33 +0000
+++ Makefile	2015-12-09 07:51:31 +0000
@@ -46,5 +46,4 @@
 	cp files/config.xml $$HOME/config.xml
 	mkdir -p $$HOME/init.groovy.d
 	cp files/cli-shutdown.groovy $$HOME/init.groovy.d
-	mkdir -p $$HOME/debdiff
 	./citrain/setup_citrain.py

=== modified file 'cupstream2distro/packagemanager.py'
--- cupstream2distro/packagemanager.py	2015-12-07 20:30:19 +0000
+++ cupstream2distro/packagemanager.py	2015-12-09 07:51:31 +0000
@@ -20,7 +20,7 @@
 import re
 import os
 
-from os.path import basename, dirname, expanduser, join
+from os.path import basename, dirname, join
 from glob import glob
 
 from cupstream2distro.version import V
@@ -225,11 +225,9 @@
         logging.info('Dest: %s', old_dsc)
         tmp_path = self.packaging_diff + '.tmp'
         log_value_of.tmp_path()
-        debdiff_env = os.environ.copy()
-        debdiff_env.update(TMPDIR=expanduser('~/debdiff'))
         with open(self.full_diff, 'wb') as full_diff:
             log_call(['debdiff', old_dsc or '', new_dsc],
-                     cwd=self.parent, stdout=full_diff, env=debdiff_env)
+                     cwd=self.parent, stdout=full_diff)
         with open(self.full_diff, 'rb') as full_diff:
             with open(tmp_path, 'wb') as tmp_diff:
                 call('filterdiff --clean -i *debian/* -x *changelog',