← Back to branch summary

~mvo/update-manager/not-automatic

« back to all changes in this revision

Viewing changes to DistUpgrade/DistUpgradeViewNonInteractive.py

  • Committer: Michael Vogt
  • Date: 2007-05-14 08:46:53 UTC
  • Revision ID: michael.vogt@ubuntu.com-20070514084653-4198aeeq1kxagndr
* DistUpgrade/DistUpgradeControler.py, DistUpgrade/DistUpgrade.cfg:
  - add "RemoveObsoletes" variable
* DistUpgrade/DistUpgradeVersion.py:
  - updated to new version
* DistUpgrade/DistUpgradeViewNonInteractive.py:
  - set the timeout to 1200s (qemu can be *very* slow)
* DistUpgrade/UpgradeTestBackendQemu.py:
  - some more todos
* debian/rules:
  - added dh_desktop, dh_iconcache, dh_gconf

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/DistUpgradeViewNonInteractive.py
46
46
        self.config = DistUpgradeConfig(".")
47
47
        if self.config.getboolean("NonInteractive","ForceOverwrite"):
48
48
            apt_pkg.Config.Set("DPkg::Options::","--force-overwrite")
49
 
        # default to 600 sec timeout
50
 
        self.timeout = 600
 
49
        # default to 1200 sec timeout
 
50
        self.timeout = 1200
51
51
        try:
52
52
            self.timeout = self.config.getint("NonInteractive","TerminalTimeout")
53
53
        except Exception, e: