diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-28 16:39:40 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-09-17 18:59:12 +0000 |
commit | 29aa8b049975db3491e772dbcc42edd2893abd45 (patch) | |
tree | f36fd91bfc0464da06b1536705a1937f119009e3 | |
parent | fd32e4b7920ddd3e5bc983b731c1712dafb37311 (diff) | |
download | morph-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.
-rw-r--r-- | morphlib/app.py | 25 | ||||
-rw-r--r-- | morphlib/buildcommand.py | 13 |
2 files changed, 0 insertions, 38 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index 642dd241..0890a786 100644 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -162,19 +162,6 @@ class Morph(cliapp.Application): group=group_storage, default='4G') - # These cannot be removed just yet because existing morph.conf files - # would fail to parse. - group_obsolete = 'Obsolete Options' - self.settings.boolean(['staging-chroot'], - 'build things in an isolated chroot ' - '(default: true)', - default=True, - group=group_obsolete) - self.settings.string_list(['staging-filler'], - 'use FILE as contents of build chroot', - metavar='FILE', - group=group_obsolete) - def check_time(self): # Check that the current time is not far in the past. if time.localtime(time.time()).tm_year < 2012: @@ -187,18 +174,6 @@ class Morph(cliapp.Application): def process_args(self, args): self.check_time() - # Handle obsolete options - if self.settings['staging-chroot'] is not True: - raise cliapp.AppException( - 'The "staging-chroot" option has been set to False. This ' - 'option is obsolete and should be left as the default (True).') - if self.settings['staging-filler']: - self.status(msg='WARNING! A staging filler was specified. Staging ' - 'fillers are deprecated and may break new builds. You ' - 'should only specify this option if you are building ' - 'a system based on a version of Baserock older than ' - 'Baserock 6.') - if self.settings['build-ref-prefix'] is None: if self.settings['trove-id']: self.settings['build-ref-prefix'] = os.path.join( 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): |