From 79ebc838d235a7be96c1748f1bcf16a0f33b71df Mon Sep 17 00:00:00 2001 From: Chulwoo Shin Date: Tue, 28 Feb 2017 03:51:13 +0900 Subject: [PATCH] [TIC-CORE] Set the default installation packages - Set the default installation packages (building-blocks-root-Headless) Change-Id: I912304ce7758156fcc5d3e8d7db4f03db8d8088e Signed-off-by: Chulwoo Shin --- tic/parser/recipe_parser.py | 6 +++--- tic/utils/file.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tic/parser/recipe_parser.py b/tic/parser/recipe_parser.py index b2f3876..ef5c6ff 100644 --- a/tic/parser/recipe_parser.py +++ b/tic/parser/recipe_parser.py @@ -70,7 +70,7 @@ def get_default_recipe(): FileName= 'default', Repos=['tizen-unified', 'tizen-base'], Groups=[], - ExtraPackages= [], + ExtraPackages= ['building-blocks-root-Headless'], RemovePackages=[] ) ], @@ -120,14 +120,14 @@ def convert_recipe_to_yaml(recipe, filepath): # configs.yaml with open(yamlinfo.configs, 'w') as outfile: - yaml.dump(config, outfile, default_flow_style=False) + yaml.safe_dump(config, outfile, default_flow_style=False) # repo.yaml if 'Repositories' in recipe: repos = {} repos['Repositories'] = recipe['Repositories'] with open(yamlinfo.repos, 'w') as outfile: - yaml.dump(repos, outfile, default_flow_style=False) + yaml.safe_dump(repos, outfile, default_flow_style=False) # partition info if 'Partitions' in recipe: diff --git a/tic/utils/file.py b/tic/utils/file.py index 06e6727..b1cf3ac 100644 --- a/tic/utils/file.py +++ b/tic/utils/file.py @@ -50,4 +50,6 @@ def copyfile(src, dst, filename=None): if filename: abs_dst = os.path.join(abs_dst, filename) shutil.copy(src, abs_dst) + if filename: + return abs_dst return os.path.join(abs_dst, os.path.basename(src)) \ No newline at end of file -- 2.7.4