Universal configurable base tmpdir for all gbp tools

Adds support for a configurable tmpdir under which all gbp tools now
create their temporary directories and files.

NOTE: an exception is git-import-dscs which doesn't use the common
configuration system.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
	gbp/scripts/common/buildpackage.py

diff --git a/gbp/config.py b/gbp/config.py
index 40d52a836c902e4919d6a685506cf0358e4a5922..cf25de847db3eca4763bd6dd7490c92fb3b3e597 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -163,6 +163,7 @@ class GbpOptionParser(OptionParser):
                  'tmp-dir' : '/var/tmp/gbp/',
                  'drop': 'False',
                  'commit': 'False',
+                 'tmp-dir' : '/var/tmp/gbp/',
              }
     help = {
              'debian-branch':
@@ -318,6 +319,9 @@ class GbpOptionParser(OptionParser):
                    "after export. Default is '%(drop)s'"),
               'commit':
                   "commit changes after export, Default is '%(commit)s'",
+              'tmp-dir':
+                  ("Base directory under which temporary directories are "
+                   "created, default is '%(tmp-dir)s'"),
            }
 
     def_config_files = [ '/etc/git-buildpackage/gbp.conf',

diff --git a/gbp/scripts/common/buildpackage.py b/gbp/scripts/common/buildpackage.py
index be5b544434ce3f309838c9789f04327e5a87784e..d089df5aadd72d3255a769c9ab49f29712955176 100644 (file)
--- a/gbp/scripts/common/buildpackage.py
+++ b/gbp/scripts/common/buildpackage.py
@@ -19,7 +19,6 @@
 """Common functionality for Debian and RPM buildpackage scripts"""
 
 import os, os.path
-import tempfile
 import subprocess
 import shutil
 

diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index af1129177f1d8b95e360ea16880fc4746d4ce6ca..70adf6e9ba4db071b9016f000ed775b4a5df0dd9 100755 (executable)
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -344,6 +344,7 @@ def build_parser(name):
                                   dest="color_scheme")
     parser.add_config_file_option(option_name="tmp-dir", dest="tmp_dir")
     parser.add_config_file_option(option_name="meta-closes", dest="meta_closes")
+    parser.add_config_file_option(option_name="tmp-dir", dest="tmp_dir")
     return parser