summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-07-15 13:45:06 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-11-14 14:47:21 +0200
commit33ea083a124a4e60b50be7870cf14151bb5a7e0f (patch)
treee2d6d01f8110f4853712d99651c0e28597a70377
parent60d7d00176ae821bb2ea98afce1a441892f7568b (diff)
downloadgit-buildpackage-33ea083a124a4e60b50be7870cf14151bb5a7e0f.tar.gz
git-buildpackage-33ea083a124a4e60b50be7870cf14151bb5a7e0f.tar.bz2
git-buildpackage-33ea083a124a4e60b50be7870cf14151bb5a7e0f.zip
buildpackage-rpm: get rid of prepare_export_dir()
No need to mangle the export directory. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-xgbp/scripts/buildpackage_rpm.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 1af5b06b..c84b0a2e 100755
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -116,12 +116,6 @@ def makedir(dir):
return dir
-def prepare_export_dir(dir):
- if not dir:
- dir = 'rpmbuild'
- return makedir(dir)
-
-
def pristine_tar_build_orig(repo, orig_file, output_dir, options):
"""
build orig using pristine-tar
@@ -584,7 +578,7 @@ def main(argv):
export_patches(repo, spec, patch_tree, options)
# Prepare final export dirs
- export_dir = prepare_export_dir(options.export_dir)
+ export_dir = makedir(options.export_dir)
source_dir = makedir(os.path.join(export_dir, options.source_dir))
spec_dir = makedir(os.path.join(export_dir, options.spec_dir))