diff --git a/.gitignore b/.gitignore index 4974a239..fc7ac197 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,3 @@ pidfile .DS_Store *.rc .anvil_bootstrapped -.bootstrap diff --git a/anvil/actions/prepare.py b/anvil/actions/prepare.py index a4a75ba9..dd2419d5 100644 --- a/anvil/actions/prepare.py +++ b/anvil/actions/prepare.py @@ -40,8 +40,6 @@ class PrepareAction(action.Action): self.root_dir, instances.values(), opts={"jobs": self.jobs}) - dependency_handler.post_bootstrap() - removals = [] self._run_phase( action.PhaseFunctors( diff --git a/anvil/packaging/base.py b/anvil/packaging/base.py index 21f3c1c0..f86bfe59 100644 --- a/anvil/packaging/base.py +++ b/anvil/packaging/base.py @@ -140,9 +140,6 @@ class DependencyHandler(object): def package_finish(self): pass - def post_bootstrap(self): - pass - def build_binary(self): pass diff --git a/anvil/packaging/yum.py b/anvil/packaging/yum.py index 28b8472d..a2f4ef58 100644 --- a/anvil/packaging/yum.py +++ b/anvil/packaging/yum.py @@ -154,15 +154,6 @@ class YumDependencyHandler(base.DependencyHandler): continue sh.move(filename, target_dir, force=True) - def post_bootstrap(self): - bs_rpmbuild_dir = sh.joinpths('.bootstrap', 'rpmbuild') - if sh.isdir(bs_rpmbuild_dir): - LOG.info("Moving RPMS build on bootstrap to deps repo") - self._move_srpms("anvil-deps", bs_rpmbuild_dir) - self._move_rpm_files(bs_rpmbuild_dir, - sh.joinpths(self.anvil_repo_dir, 'anvil-deps')) - sh.deldir(bs_rpmbuild_dir) - def build_binary(self): def is_src_rpm(path): if not path: