← Back to branch summary

~ubuntu-core-dev/ubuntu-release-upgrader/artful

« back to all changes in this revision

Viewing changes to DistUpgrade/DistUpgradeController.py

  • Committer: Brian Murray
  • Date: 2017-05-18 17:51:19 UTC
  • mfrom: (3052.1.2 trunk)
  • Revision ID: brian@canonical.com-20170518175119-ljp4raic535jd958
https://launchpad.net/bugs/1605259
Remove --sandbox (aufs support) as it has been broken for some time and
was rather unused. (LP: #1605259)

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/DistUpgradeController.py
57
57
from .DistUpgradeConfigParser import DistUpgradeConfig
58
58
from .DistUpgradeQuirks import DistUpgradeQuirks
59
59
from .DistUpgradeAptCdrom import AptCdrom
60
 
from .DistUpgradeAufs import setupAufs, aufsOptionsAndEnvironmentSetup
61
60
 
62
61
# workaround broken relative import in python-apt (LP: #871007), we
63
62
# want the local version of distinfo.py from oneiric, but because of
138
137
        self.config.add_section("Options")
139
138
        self.config.set("Options","withNetwork", str(self.useNetwork))
140
139
 
141
 
        # aufs stuff
142
 
        aufsOptionsAndEnvironmentSetup(self.options, self.config)
143
 
 
144
140
        # some constants here
145
141
        self.fromDist = self.config.get("Sources","From")
146
142
        self.toDist = self.config.get("Sources","To")
399
395
                               "supported with this tool." % (release, self.toDist)))
400
396
            sys.exit(1)
401
397
 
402
 
        # setup aufs
403
 
        if self.config.getWithDefault("Aufs", "EnableFullOverlay", False):
404
 
            aufs_rw_dir = self.config.get("Aufs","RWDir")
405
 
            if not setupAufs(aufs_rw_dir):
406
 
                logging.error("aufs setup failed")
407
 
                self._view.error(_("Sandbox setup failed"),
408
 
                                 _("It was not possible to create the sandbox "
409
 
                                   "environment."))
410
 
                return False
411
 
 
412
 
            # all good, tell the user about the sandbox mode
413
 
            logging.info("running in aufs overlay mode")
414
 
            self._view.information(_("Sandbox mode"),
415
 
                                   _("This upgrade is running in sandbox "
416
 
                                     "(test) mode. All changes are written "
417
 
                                     "to '%s' and will be lost on the next "
418
 
                                     "reboot.\n\n"
419
 
                                     "*No* changes written to a system directory "
420
 
                                     "from now until the next reboot are "
421
 
                                     "permanent.") % aufs_rw_dir)
422
 
 
423
398
        # setup backports (if we have them)
424
399
        if self.options and self.options.havePrerequists:
425
400
            backportsdir = os.getcwd()+"/backports"