← Back to branch summary

~ubuntu-branches/ubuntu/karmic/update-manager/karmic-updates

« back to all changes in this revision

Viewing changes to DistUpgrade/xorg_fix_proprietary.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-10-23 14:06:21 UTC
  • Revision ID: james.westby@ubuntu.com-20091023140621-icpi6wmswfqi6r9q
Tags: 1:0.126.6
https://launchpad.net/bugs/344693
* debian/control:
  - updated to point the karmic branch
* UpdateManager/GtkProgress.py:
  - fix small cosmetic problem with the release-upgrader
    download window size
* DistUpgrade/xorg_fix_proprietary.py:
  - if xorg.conf is zero size, remove it (LP: # 439551)
* change unicode "◦" to "*" to make translations
  work (LP: #344693) and unfuzzy translations

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/xorg_fix_proprietary.py
123
123
        logging.info("No xorg.conf, exiting")
124
124
        sys.exit(0)
125
125
        
 
126
    # remove empty xorg.conf to help xorg and its auto probing logic
 
127
    # (LP: #439551)
 
128
    if os.path.getsize(XORG_CONF) == 0:
 
129
        logging.info("xorg.conf is zero size, removing")
 
130
        os.remove(XORG_CONF)
 
131
        sys.exit(0)
 
132
 
126
133
    #make a backup of the xorg.conf
127
134
    backup = XORG_CONF + ".dist-upgrade-" + time.strftime("%Y%m%d%H%M")
128
135
    logging.debug("creating backup '%s'" % backup)