diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-05 23:39:07 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-17 21:19:22 +0200 |
| commit | 164fb9a150d2a210aee7fa66d0e06ed475c4bdd8 (patch) | |
| tree | 8af07ed64e5a77e0fbba084b5b1a0a4577bbddb1 /mesonbuild/wrap/wraptool.py | |
| parent | 5b9d79b9029f1a9be897188c6ffbdce65d4e510b (diff) | |
| download | meson-164fb9a150d2a210aee7fa66d0e06ed475c4bdd8.zip meson-164fb9a150d2a210aee7fa66d0e06ed475c4bdd8.tar.gz meson-164fb9a150d2a210aee7fa66d0e06ed475c4bdd8.tar.bz2 | |
Also promote wrap files.
Diffstat (limited to 'mesonbuild/wrap/wraptool.py')
| -rw-r--r-- | mesonbuild/wrap/wraptool.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mesonbuild/wrap/wraptool.py b/mesonbuild/wrap/wraptool.py index 096ab4d..00115cb 100644 --- a/mesonbuild/wrap/wraptool.py +++ b/mesonbuild/wrap/wraptool.py @@ -145,11 +145,15 @@ def info(name): print(' ', v['branch'], v['revision']) def do_promotion(from_path, spdir_name): - sproj_name = os.path.split(from_path)[1] - outputdir = os.path.join(spdir_name, sproj_name) - if os.path.exists(outputdir): - sys.exit('Output dir %s already exists. Will not overwrite.' % outputdir) - shutil.copytree(from_path, outputdir, ignore=shutil.ignore_patterns('subprojects')) + if os.path.isfile(from_path): + assert(from_path.endswith('.wrap')) + shutil.copy(from_path, spdir_name) + elif os.path.isdir(from_path): + sproj_name = os.path.split(from_path)[1] + outputdir = os.path.join(spdir_name, sproj_name) + if os.path.exists(outputdir): + sys.exit('Output dir %s already exists. Will not overwrite.' % outputdir) + shutil.copytree(from_path, outputdir, ignore=shutil.ignore_patterns('subprojects')) def promote(argument): path_segment, subproject_name = os.path.split(argument) |