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

ostbuild: Rename shadow-repo-init -> init

This commit is contained in:
Colin Walters 2012-05-02 07:55:11 -04:00
parent 44bb3aaa54
commit 8785fefda8
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-ostbuild.am
View File

@ -35,7 +35,7 @@ pyostbuild_PYTHON = \
src/ostbuild/pyostbuild/builtin_resolve.py \ src/ostbuild/pyostbuild/builtin_resolve.py \
src/ostbuild/pyostbuild/builtin_modify_snapshot.py \ src/ostbuild/pyostbuild/builtin_modify_snapshot.py \
src/ostbuild/pyostbuild/builtin_tree_to_bin.py \ src/ostbuild/pyostbuild/builtin_tree_to_bin.py \
src/ostbuild/pyostbuild/builtin_shadow_repo_init.py \ src/ostbuild/pyostbuild/builtin_init.py \
src/ostbuild/pyostbuild/builtin_status.py \ src/ostbuild/pyostbuild/builtin_status.py \
src/ostbuild/pyostbuild/builtins.py \ src/ostbuild/pyostbuild/builtins.py \
src/ostbuild/pyostbuild/filemonitor.py \ src/ostbuild/pyostbuild/filemonitor.py \

16
src/ostbuild/pyostbuild/builtin_shadow_repo_init.py → src/ostbuild/pyostbuild/builtin_init.py
View File

@ -22,13 +22,14 @@ import select,time
import argparse import argparse
from . import builtins from . import builtins
from . import ostbuildrc
from .ostbuildlog import log, fatal from .ostbuildlog import log, fatal
from . import fileutil from . import fileutil
from .subprocess_helpers import run_sync, run_sync_get_output from .subprocess_helpers import run_sync, run_sync_get_output
class OstbuildShadowRepoInit(builtins.Builtin): class OstbuildInit(builtins.Builtin):
name = "shadow-repo-init" name = "init"
short_description = "Initialize a user-mode shadow repository for /ostree/repo" short_description = "Initialize working state"
def __init__(self): def __init__(self):
builtins.Builtin.__init__(self) builtins.Builtin.__init__(self)
@ -38,15 +39,20 @@ class OstbuildShadowRepoInit(builtins.Builtin):
args = parser.parse_args(argv) args = parser.parse_args(argv)
mirrordir = os.path.expanduser(ostbuildrc.get_key('mirrordir'))
fileutil.ensure_dir(mirrordir)
workdir = os.path.expanduser(ostbuildrc.get_key('workdir'))
fileutil.ensure_dir(workdir)
self.parse_config() self.parse_config()
path = os.path.join(self.workdir, 'shadow-repo') path = os.path.join(self.workdir, 'shadow-repo')
fileutil.ensure_dir(path) fileutil.ensure_dir(path)
if os.path.isdir(os.path.join(path, 'objects')): if os.path.isdir(os.path.join(path, 'objects')):
log("Shadow repository '%s' appears to already exist" % (path, )) log("note: shadow repository '%s' already exists" % (path, ))
else: else:
run_sync(['ostree', '--repo=' + path, 'init', '--archive']) run_sync(['ostree', '--repo=' + path, 'init', '--archive'])
run_sync(['ostree', '--repo=' + path, 'config', 'set', 'core.parent', '/ostree/repo']) run_sync(['ostree', '--repo=' + path, 'config', 'set', 'core.parent', '/ostree/repo'])
log("Created shadow repository: %s" % (path, )) log("Created shadow repository: %s" % (path, ))
builtins.register(OstbuildShadowRepoInit) builtins.register(OstbuildInit)

2
src/ostbuild/pyostbuild/main.py
View File

@ -35,7 +35,7 @@ from . import builtin_prefix
from . import builtin_resolve from . import builtin_resolve
from . import builtin_modify_snapshot from . import builtin_modify_snapshot
from . import builtin_tree_to_bin from . import builtin_tree_to_bin
from . import builtin_shadow_repo_init from . import builtin_init
from . import builtin_status from . import builtin_status
def usage(ecode): def usage(ecode):