Merge lp://staging/~stgraber/software-center/fix-weblive-isinstance into lp://staging/software-center
Proposed by
Stéphane Graber
Status: | Merged |
---|---|
Merged at revision: | 3204 |
Proposed branch: | lp://staging/~stgraber/software-center/fix-weblive-isinstance |
Merge into: | lp://staging/software-center |
Diff against target: |
61 lines (+7/-5) 2 files modified
softwarecenter/backend/weblive_pristine.py (+5/-5) utils/piston-helpers/x2go_helper.py (+2/-0) |
To merge this branch: | bzr merge lp://staging/~stgraber/software-center/fix-weblive-isinstance |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gary Lasker (community) | Approve | ||
Review via email: mp+126794@code.staging.launchpad.net |
Description of the change
When weblive_pristine.py was ported to be pep8 clean and python3 ready the
logic in one of the isinstance() call was reversed, preventing weblive sessions
from establishing.
I merged the changes uptream and fixed the upstream weblive.py module to work,
this branch simply re-syncs with upstream.
To post a comment you must log in.
Hi Stéphane! Thank you for finding this and for the fix. Merging now.