← Back to branch summary

~dpm/ubuntu/lucid/update-manager/bug-537277

« back to all changes in this revision

Viewing changes to DistUpgrade/xorg_fix_proprietary.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt, Michael Vogt, Wesley Schwengle, Dustin Kirkland, Jonathan Riddell
  • Date: 2010-03-08 20:58:44 UTC
  • Revision ID: james.westby@ubuntu.com-20100308205844-y47e225am3aujmwr
Tags: 1:0.133
https://launchpad.net/bugs/415026
https://launchpad.net/bugs/522452
[ Michael Vogt ]
* UpdateManager/Core/MetaRelease.py:
  - allow upgrade from unsupported version to unsupported version
* DistUpgrade/removal_blacklist.cfg:
  - allow removal of update-manager-kde
* check-new-release-gtk:
  - fixes in the gtk release upgrade check
* DistUpgrade/xorg_fix_proprietary.py:
  - if /etc/X11/XF86Config-4 is found on upgrade, rename it to
    "XF86Config-4.obsolete"
  - write log to "/var/log/dist-upgrade/xorg_fixup.log"
* do-release-upgrade, check-new-release:
  - implemented "check-releae-upgrade" as symlink to do-release-upgrade
    and automatically run with "--check-dist-upgrade-only" when called
    as c-r-u
  - add --quiet option to do-release-upgrade
* debian/update-manager-core.links:
  - install /usr/lib/update-manager/check-new-release as symlink to
    do-release-upgrade -c

[ Wesley Schwengle ]
* Check for release upgrade is now also possible with do-release-upgrade
  command: do-release-upgrade -c. (LP: #415026)
* Added --version/-V to do-release-upgrade (similar to update-manager)

[ Dustin Kirkland ]
* debian/91-release-upgrade, debian/update-manager-core.install,
  - some users are complaining of long login times due to the release
    check requiring network connectivity; this information clearly doesn't
    change as frequently as the user logging in, so maintain a cache file
    in /var/lib, display it if it's populated, but otherwise, update it in
    the background if its either missing or the file is older than a day
    old, LP: #522452

[ Jonathan Riddell ]
* Do not allow for the removal of update-manager-kde, we do want it after all

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/xorg_fix_proprietary.py
14
14
import subprocess
15
15
import apt_pkg
16
16
 
 
17
# main xorg.conf
17
18
XORG_CONF="/etc/X11/xorg.conf"
18
19
 
 
20
# really old and most likely obsolete conf
 
21
OBSOLETE_XORG_CONF="/etc/X11/XF86Config-4"
 
22
 
19
23
def remove_input_devices(xorg_source=XORG_CONF, xorg_destination=XORG_CONF):
20
24
    logging.debug("remove_input_devices")
21
25
    content=[]
114
118
 
115
119
    # setup logging
116
120
    logging.basicConfig(level=logging.DEBUG,
117
 
                        filename="/var/log/dist-upgrade/xorg_fix_intrepid.log",
 
121
                        filename="/var/log/dist-upgrade/xorg_fixup.log",
118
122
                        filemode='w')
119
123
    
120
124
    logging.info("%s running" % sys.argv[0])
121
125
 
 
126
    if os.path.exists(OBSOLETE_XORG_CONF):
 
127
        old = OBSOLETE_XORG_CONF
 
128
        new =  OBSOLETE_XORG_CONF+".obsolete"
 
129
        logging.info("renaming obsolete %s -> %s" % (old, new))
 
130
        os.rename(old, new)
 
131
 
122
132
    if not os.path.exists(XORG_CONF):
123
133
        logging.info("No xorg.conf, exiting")
124
134
        sys.exit(0)