packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ostbuild: Few more misc fixes

This commit is contained in:
Colin Walters 2012-05-22 08:26:17 -04:00
parent 95f66e1157
commit b45a0803fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ostbuild/pyostbuild/builtin_build.py
View File

@ -192,6 +192,7 @@ class OstbuildBuild(builtins.Builtin):
devel_name = 'bases/%s' % (base['devel'], ) devel_name = 'bases/%s' % (base['devel'], )
compose_rootdir = os.path.join(self.workdir, 'roots', target['name']) compose_rootdir = os.path.join(self.workdir, 'roots', target['name'])
fileutil.ensure_parent_dir(compose_rootdir)
if os.path.isdir(compose_rootdir): if os.path.isdir(compose_rootdir):
shutil.rmtree(compose_rootdir) shutil.rmtree(compose_rootdir)
os.mkdir(compose_rootdir) os.mkdir(compose_rootdir)

3
src/ostbuild/pyostbuild/builtins.py
View File

@ -182,7 +182,7 @@ class Builtin(object):
if os.path.isdir(shadow_path): if os.path.isdir(shadow_path):
self.repo = shadow_path self.repo = shadow_path
else: else:
fatal("No repository configured, and shadow-repo not found. Use \"ostbuild shadow-repo-init\" to make one") fatal("No repository configured, and shadow-repo not found. Use \"ostbuild init\" to make one")
def parse_prefix(self, prefix): def parse_prefix(self, prefix):
if prefix is not None: if prefix is not None:
@ -212,7 +212,6 @@ class Builtin(object):
repo_path = os.path.join(self.ostree_dir, 'repo') repo_path = os.path.join(self.ostree_dir, 'repo')
if not os.path.isdir(repo_path): if not os.path.isdir(repo_path):
fatal("Repository '%s' doesn't exist" % (repo_path, )) fatal("Repository '%s' doesn't exist" % (repo_path, ))
self.repo = repo_path
if self.active_branch is None: if self.active_branch is None:
fatal("No \"current\" link found") fatal("No \"current\" link found")
tree_path = os.path.join(self.ostree_dir, self.active_branch) tree_path = os.path.join(self.ostree_dir, self.active_branch)