summaryrefslogtreecommitdiff
path: root/morphlib/buildcommand.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-28 16:39:40 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-09-17 18:59:12 +0000
commit29aa8b049975db3491e772dbcc42edd2893abd45 (patch)
treef36fd91bfc0464da06b1536705a1937f119009e3 /morphlib/buildcommand.py
parentfd32e4b7920ddd3e5bc983b731c1712dafb37311 (diff)
downloadmorph-29aa8b049975db3491e772dbcc42edd2893abd45.tar.gz
Remove --staging-chroot, --staging-filler options
This also removes the long-obsolete code to install staging fillers in the staging area. We've not allowed users to do that for ages now.
Diffstat (limited to 'morphlib/buildcommand.py')
-rw-r--r--morphlib/buildcommand.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index 32c740a4..d7007233 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -275,7 +275,6 @@ class BuildCommand(object):
extra_env=extra_env,
extra_path=extra_path)
try:
- self.install_fillers(staging_area)
self.install_dependencies(staging_area, deps, artifact)
except BaseException:
staging_area.abort()
@@ -370,18 +369,6 @@ class BuildCommand(object):
self.app.status(msg='Removing staging area')
staging_area.remove()
- def install_fillers(self, staging_area):
- '''Install staging fillers into the staging area.'''
-
- logging.debug('Pre-populating staging area %s' % staging_area.dirname)
- logging.debug('Fillers: %s' %
- repr(self.app.settings['staging-filler']))
- for filename in self.app.settings['staging-filler']:
- with open(filename, 'rb') as f:
- self.app.status(msg='Installing %(filename)s',
- filename=filename)
- staging_area.install_artifact(f)
-
# Nasty hack to avoid installing chunks built in 'bootstrap' mode in a
# different stratum when constructing staging areas.
def is_stratum(self, a):