From 0c678d9f0534bfd3eeb06d32d36d69a70e8c6b66 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 25 Sep 2009 11:41:12 -0600 Subject: [PATCH] Fix #3590 (calibre 0.6.13 source package is a tarbomb) --- .project | 18 ------------------ .pydevproject | 10 ---------- setup/install.py | 5 +++-- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 .project delete mode 100644 .pydevproject diff --git a/.project b/.project deleted file mode 100644 index 684c2fe798..0000000000 --- a/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - libprs500 - - - ipython - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/.pydevproject b/.pydevproject deleted file mode 100644 index 509137a36a..0000000000 --- a/.pydevproject +++ /dev/null @@ -1,10 +0,0 @@ - - - - -python 2.6 - -/calibre-pluginize/src - -Default - diff --git a/setup/install.py b/setup/install.py index d9f5f3e4fe..62ad9bd7b5 100644 --- a/setup/install.py +++ b/setup/install.py @@ -215,6 +215,7 @@ class Sdist(Command): if not self.e(self.d(self.DEST)): os.makedirs(self.d(self.DEST)) tdir = tempfile.mkdtemp() + tdir = self.j(tdir, 'calibre') atexit.register(shutil.rmtree, tdir) self.info('\tRunning bzr export...') subprocess.check_call(['bzr', 'export', '--format', 'dir', tdir]) @@ -237,8 +238,8 @@ class Sdist(Command): shutil.copy2(f, dest) self.info('\tCreating tarfile...') - subprocess.check_call(' '.join(['tar', '-czf', self.a(self.DEST), '*']), - cwd=tdir, shell=True) + subprocess.check_call(['tar', '-czf', self.a(self.DEST), + 'calibre'], cwd=self.d(tdir)) def clean(self): if os.path.exists(self.DEST):