← Back to branch summary

~evfool/software-center/lp626037

« back to all changes in this revision

Viewing changes to softwarecenter/db/application.py

  • Committer: Gary Lasker
  • Date: 2012-05-08 04:57:33 UTC
  • mfrom: (2989.2.8 5.2)
  • Revision ID: gary.lasker@canonical.com-20120508045733-56izfccd4hj3fcvv
merge the 5.2 branch lp:software-center/5.2 to grab the current set of fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/db/application.py
673
673
            # ignore read errors, most likely transient
674
674
            return
675
675
        if content is not None:
676
 
            content = json.loads(content)
 
676
            try:
 
677
                content = json.loads(content)
 
678
            except ValueError as e:
 
679
                LOG.error("can not decode: '%s' (%s)" % (content, e))
 
680
                content = None
677
681
 
678
682
        if isinstance(content, dict):
679
683
            # a list of screenshots as listsed online