[releng] convert-to-tarballs: Add sane default tarball dir
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [releng] convert-to-tarballs: Add sane default tarball dir
- Date: Tue, 13 Feb 2018 18:14:56 +0000 (UTC)
commit 49230a2e50286aeefce5a433077a8e2e002cd28c
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Tue Feb 13 11:56:26 2018 -0600
convert-to-tarballs: Add sane default tarball dir
.gitignore | 1 +
tools/smoketesting/convert-to-tarballs.py | 15 ++++++---------
2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..60a5aa5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+tools/smoketesting/tarballs
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index 3434e3e..12ab236 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -786,10 +786,6 @@ def main(args):
help="tarball-conversion config file", metavar="FILE")
parser.add_option("-l", "--local-only", action="store_true", dest="local_only",
default=False, help="only look for files on a local file system")
-
- if os.path.exists(os.path.join(os.getcwd(), 'tarballs')):
- parser.set_defaults(tarballdir=os.path.join(os.getcwd(), 'tarballs'))
-
(options, args) = parser.parse_args()
if not options.version:
@@ -797,11 +793,12 @@ def main(args):
sys.exit(1)
if not options.tarballdir:
- options.tarballdir = os.getcwd()
-
- if not options.tarballdir:
- sys.stderr.write("ERROR: destination directory of tarballs is not defined\n")
- sys.exit(1)
+ tarballdir = os.path.join(os.getcwd(), 'tarballs')
+ try:
+ os.mkdir(tarballdir)
+ except OSError:
+ pass
+ options.tarballdir = tarballdir
splitted_version = options.version.split(".")
if (len(splitted_version) != 3):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]