Merge lp://staging/~bkerensa/sessioninstaller/fix-for-988775 into lp://staging/sessioninstaller
Proposed by
Benjamin Kerensa
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Michael Vogt | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~bkerensa/sessioninstaller/fix-for-988775 | ||||
| Merge into: | lp://staging/sessioninstaller | ||||
| Diff against target: |
7538 lines (+7270/-0) (has conflicts) 47 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/.version (+1/-0) .pc/01_disable_install_print_drivers.patch/sessioninstaller/core.py (+1515/-0) .pc/02_no_crash_on_install_provides.patch/sessioninstaller/core.py (+1516/-0) .pc/03_synchronous_transactions.patch/sessioninstaller/backends/aptd.py (+134/-0) .pc/applied-patches (+3/-0) AUTHORS (+1/-0) COPYRIGHT (+339/-0) HACKING (+5/-0) NEWS (+33/-0) README (+65/-0) TODO (+8/-0) data/sessioninstaller.service (+3/-0) debian/changelog (+168/-0) debian/compat (+1/-0) debian/control (+46/-0) debian/copyright (+36/-0) debian/dirs (+2/-0) debian/examples (+1/-0) debian/patches/01_disable_install_print_drivers.patch (+15/-0) debian/patches/02_no_crash_on_install_provides.patch (+16/-0) debian/patches/03_synchronous_transactions.patch (+29/-0) debian/patches/series (+3/-0) debian/postinst (+13/-0) debian/prerem (+15/-0) debian/rules (+8/-0) debian/source/format (+1/-0) debian/watch (+2/-0) doc/example.catalog (+26/-0) doc/gst-install.1 (+39/-0) doc/org.freedesktop.PackageKit.xml (+455/-0) doc/session-installer.1 (+41/-0) gst-install (+27/-0) po/de.po (+358/-0) release.sh (+21/-0) session-installer (+28/-0) sessioninstaller/__init__.py (+25/-0) sessioninstaller/backends/aptd.py (+141/-0) sessioninstaller/backends/dummy.py (+57/-0) sessioninstaller/backends/synaptic.py (+96/-0) sessioninstaller/core.py (+1516/-0) sessioninstaller/errors.py (+88/-0) sessioninstaller/gstinstaller.py (+114/-0) sessioninstaller/utils.py (+87/-0) setup.py (+16/-0) test (+154/-0) Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYRIGHT. Moved existing file to COPYRIGHT.moved. Conflict adding file HACKING. Moved existing file to HACKING.moved. Conflict adding file NEWS. Moved existing file to NEWS.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file TODO. Moved existing file to TODO.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file gst-install. Moved existing file to gst-install.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file release.sh. Moved existing file to release.sh.moved. Conflict adding file session-installer. Moved existing file to session-installer.moved. Conflict adding file sessioninstaller. Moved existing file to sessioninstaller.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. Conflict adding file test. Moved existing file to test.moved. |
||||
| To merge this branch: | bzr merge lp://staging/~bkerensa/sessioninstaller/fix-for-988775 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
fix for core.py
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks, this is merged now into trunk and also uploaded to raring.