← Back to branch summary

~free.ekanayaka/landscape-client/lucid-1.5.0-0ubuntu0.10.04.0

« back to all changes in this revision

Viewing changes to landscape/manager/customgraph.py

  • Committer: Bazaar Package Importer
  • Author(s): Free Ekanayaka
  • Date: 2009-12-16 10:50:05 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20091216105005-svplwdorkgz6vja7
Tags: 1.4.0-0ubuntu0.10.04.0
https://launchpad.net/bugs/456124
https://launchpad.net/bugs/340843
https://launchpad.net/bugs/450629
https://launchpad.net/bugs/455217
https://launchpad.net/bugs/462543
https://launchpad.net/bugs/463321
* New upstream release with several bug fixes:
  - Fix landscape daemons fail to start when too many groups are
    available (LP: #456124)
  - Fix landscape programs wake up far too much. (LP: #340843)
  - Fix Package manager fails with 'no such table: task' (LP #465846)
  - Fix test suite leaving temporary files around (LP #476418)
  - Fix the 1hr long wait for user data to be uploaded following a
    resynchronisation (LP #369000)

* Add support for Ubuntu release upgrades:
  - Add helper function to fetch many files at once (LP: #450629)
  - Handle release-upgrade messages in the packagemanager
    plugin (LP: #455217)
  - Add a release-upgrader task handler (LP: #462543)
  - Support upgrade-tool environment variables (LP: #463321)

* Add initial support for Smart package locking:
  - Detect and report changes about Smart package locks (#488108)

* Packaging fixes:
  - Turn unnecessary Pre-Depends on python-gobject into a regular Depends
  - If it's empty, remove /etc/landscape upon purge

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/manager/customgraph.py
126
126
 
127
127
        try:
128
128
            uid, gid = get_user_info(user)[:2]
129
 
        except UnknownUserError, e:
 
129
        except UnknownUserError:
130
130
           logging.error(u"Attempt to add graph with unknown user %s" %
131
131
                         user)
132
132
        else:
138
138
        self.registry.store.add_graph(graph_id, filename, user)
139
139
 
140
140
    def _format_exception(self, e):
141
 
        return u"%s: %s" % (e.__class__.__name__, e)
 
141
        return u"%s: %s" % (e.__class__.__name__, e.args[0])
142
142
 
143
143
    def exchange(self, urgent=False):
144
144
        self.registry.broker.call_if_accepted(
172
172
            return
173
173
        try:
174
174
            data = float(output)
175
 
        except ValueError, e:
 
175
        except ValueError:
176
176
            if output:
177
177
                raise InvalidFormatError(output)
178
178
            else: