compile on an older Ubuntu

etotheipi · Mar 19, 2014 · 55dfe12 · 55dfe12
1 parent 1e95641
commit 55dfe12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dpkgfiles/make_deb_package.py b/dpkgfiles/make_deb_package.py
@@ -76,7 +76,7 @@ def pwd():
 execAndWait('rm -f %s*' % pkgdir)
 execAndWait('rm -f %s*' % pkgdir_)
 shutil.copytree(origDir, pkgdir)
-execAndWait('tar --exclude .git -zcf %s.tar.gz %s' % (pkgdir, pkgdir))
+execAndWait('tar -zcf %s.tar.gz %s' % (pkgdir, pkgdir))
 cd(pkgdir)
 execAndWait('export DEBFULLNAME="Armory Technologies, Inc."; dh_make -s -e support@bitcoinarmory.com -f ../%s.tar.gz' % pkgdir)
 for f in dpkgfiles:

diff --git a/dpkgfiles/rules b/dpkgfiles/rules
@@ -13,5 +13,5 @@
 	dh $@
 
 override_dh_auto_build:
-	$(shell dpkg-buildflags --export=sh) ; make PYVER=python2.6
+	make PYVER=python2.6
 
diff --git a/subprocess.py b/subprocess.py
@@ -1291,7 +1291,7 @@ def _dup2(a, b):
 
                             # Close pipe fds.  Make sure we don't close the
                             # same fd more than once, or standard fds.
-                            closed = { None }
+                            closed = set(None)
                             for fd in [p2cread, c2pwrite, errwrite]:
                                 if fd not in closed and fd > 2:
                                     os.close(fd)