Check the format of build conf

build conf must end with .conf and can't contain '-'.

Change-Id: I44dc370b40844a0c1b911c50cd4f22cfe644bd5c

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index c73ed4c1417bcb4ebb50f21e3bbe400429917595..e823bc49fd18b5cfbcad4c4743bdc0d8f85c689f 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -120,9 +120,10 @@ def prepare_repos_and_build_conf(opts, arch):
     # must use abspath here, because build command will also use this path
     distconf = os.path.abspath(distconf)
 
-    target_conf = os.path.basename(distconf).replace('-', '')
-    os.rename(distconf, os.path.join(os.path.dirname(distconf), target_conf))
-    dist = target_conf.rsplit('.', 1)[0]
+    if not distconf.endswith('.conf') or '-' in os.path.basename(distconf):
+        msger.error("build config file must end with .conf, and can't "
+                    "contain '-'")
+    dist = os.path.basename(distconf)[:-len('.conf')]
     cmd_opts += ['--dist=%s' % dist]
     cmd_opts += ['--configdir=%s' % os.path.dirname(distconf)]