Merge lp://qastaging/~roadmr/ubuntu/precise/checkbox/0.13.1-retry into lp://qastaging/ubuntu/precise/checkbox
Proposed by
Daniel Manrique
| Status: | Merged |
|---|---|
| Merge reported by: | Mathieu Trudel-Lapierre |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~roadmr/ubuntu/precise/checkbox/0.13.1-retry |
| Merge into: | lp://qastaging/ubuntu/precise/checkbox |
| Diff against target: |
484189 lines (+265504/-169975) 174 files modified
bin/checkbox-cli (+1/-1) bin/checkbox-gtk (+1/-1) bin/checkbox-urwid (+1/-1) checkbox/lib/config.py (+3/-1) checkbox/lib/template_i18n.py (+2/-1) checkbox/parsers/submission.py (+8/-4) checkbox/user_interface.py (+1/-1) checkbox_gtk/gtk_interface.py (+8/-3) data/whitelists/default.whitelist (+47/-21) debian/changelog (+94/-1) debian/checkbox-cli.postinst (+1/-0) debian/checkbox-gtk.postinst (+1/-0) debian/checkbox-urwid.postinst (+1/-0) debian/control (+6/-38) debian/hwtest-cli.postinst (+0/-6) debian/hwtest-gtk.postinst (+0/-6) debian/hwtest.postinst (+0/-6) debian/hwtest.postrm (+0/-26) debian/po/de.po (+3/-4) debian/po/en_AU.po (+3/-4) debian/po/en_GB.po (+4/-5) debian/po/es.po (+5/-5) debian/po/fr.po (+3/-4) debian/po/he.po (+3/-4) debian/po/hu.po (+3/-4) debian/po/it.po (+3/-4) debian/po/ja.po (+6/-10) debian/po/nl.po (+3/-4) debian/po/pl.po (+3/-4) debian/po/pt_BR.po (+3/-4) debian/po/ro.po (+3/-4) debian/po/ru.po (+3/-4) debian/po/uk.po (+118/-0) debian/po/zh_TW.po (+4/-7) debian/rules (+0/-6) debian/source/format (+1/-0) install/config (+4/-5) install/postinst (+17/-21) jobs/audio.txt.in (+9/-12) jobs/bluetooth.txt.in (+6/-14) jobs/camera.txt.in (+1/-17) jobs/firewire.txt.in (+32/-7) jobs/graphics.txt.in (+18/-26) jobs/keys.txt.in (+5/-9) jobs/local.txt.in (+1/-1) jobs/mediacard.txt.in (+318/-158) jobs/memory.txt.in (+5/-10) jobs/miscellanea.txt.in (+4/-5) jobs/monitor.txt.in (+6/-0) jobs/networking.txt.in (+11/-2) jobs/optical.txt.in (+1/-2) jobs/panel_clock_test.txt.in (+1/-1) jobs/resource.txt.in (+9/-0) jobs/suspend.txt.in (+69/-26) jobs/usb.txt.in (+34/-17) jobs/user_apps.txt.in (+2/-2) jobs/wireless.txt.in (+62/-0) plugins/apport_prompt.py (+4/-3) plugins/backend_info.py (+10/-0) plugins/intro_prompt.py (+7/-5) plugins/jobs_prompt.py (+17/-5) plugins/launchpad_report.py (+2/-1) plugins/recover_prompt.py (+4/-2) plugins/shell_test.py (+1/-1) po/POTFILES.in (+2/-0) po/ace.po (+2170/-1770) po/af.po (+2164/-1770) po/am.po (+2185/-1770) po/ar.po (+2472/-2020) po/ast.po (+3969/-2264) po/be.po (+3927/-1931) po/bg.po (+2819/-2045) po/bn.po (+2942/-1956) po/bo.po (+2245/-1778) po/br.po (+2339/-1806) po/bs.po (+3856/-2116) po/ca.po (+3234/-2211) po/ca@valencia.po (+2964/-1997) po/checkbox.pot (+2147/-1763) po/ckb.po (+2192/-1774) po/cs.po (+3938/-2404) po/cy.po (+2156/-1771) po/da.po (+3571/-2266) po/de.po (+5006/-2478) po/dv.po (+2151/-1769) po/el.po (+4319/-2105) po/en_AU.po (+4874/-2289) po/en_CA.po (+2560/-1864) po/en_GB.po (+4974/-2336) po/eo.po (+3109/-2165) po/es.po (+4248/-2325) po/et.po (+2236/-1791) po/eu.po (+2323/-1796) po/fa.po (+2151/-1769) po/fi.po (+3351/-2252) po/fr.po (+4114/-2246) po/ga.po (+2992/-0) po/gd.po (+2125/-1739) po/gl.po (+3802/-2056) po/he.po (+2902/-2070) po/hi.po (+2659/-1837) po/hr.po (+2330/-1797) po/hu.po (+3822/-2253) po/hy.po (+2151/-1769) po/id.po (+2295/-1892) po/is.po (+2208/-1871) po/it.po (+3970/-2446) po/ja.po (+3387/-1984) po/jbo.po (+2151/-1769) po/ka.po (+2172/-1796) po/kk.po (+2236/-1778) po/km.po (+2151/-1769) po/kn.po (+2176/-1770) po/ko.po (+2712/-1858) po/ku.po (+2167/-1770) po/ky.po (+2151/-1769) po/lt.po (+2333/-1776) po/lv.po (+3318/-1899) po/mk.po (+2250/-1891) po/ml.po (+2160/-1769) po/mr.po (+2163/-1769) po/ms.po (+4978/-2213) po/my.po (+2243/-1791) po/nb.po (+2525/-1996) po/nds.po (+2151/-1769) po/ne.po (+2226/-1778) po/nl.po (+4474/-2368) po/nn.po (+2173/-1770) po/oc.po (+2934/-1897) po/pl.po (+3634/-2303) po/ps.po (+2992/-0) po/pt.po (+3426/-2151) po/pt_BR.po (+4988/-2313) po/ro.po (+2809/-2049) po/ru.po (+5108/-2399) po/shn.po (+2992/-0) po/si.po (+2163/-1769) po/sk.po (+2668/-2068) po/sl.po (+3771/-2194) po/sq.po (+3610/-1890) po/sr.po (+3716/-2188) po/sv.po (+3762/-2302) po/ta.po (+2161/-1770) po/te.po (+2160/-1769) po/th.po (+2359/-1938) po/tr.po (+3467/-2112) po/ug.po (+3820/-2051) po/uk.po (+2656/-1998) po/ur.po (+2151/-1769) po/uz.po (+2992/-0) po/vi.po (+2629/-1875) po/zh_CN.po (+2970/-1990) po/zh_HK.po (+2731/-1958) po/zh_TW.po (+2718/-1901) scripts/audio_settings (+108/-0) scripts/camera_test (+4/-30) scripts/check_is_laptop (+29/-0) scripts/compiz-check (+0/-968) scripts/connect_wireless (+1/-1) scripts/cpu_offlining (+2/-2) scripts/cpu_topology (+3/-3) scripts/create_connection (+132/-0) scripts/media_keys_test (+275/-0) scripts/memory_compare (+25/-0) scripts/network_device_info (+24/-0) scripts/network_test (+0/-24) scripts/network_wait (+20/-0) scripts/removable_storage_test (+144/-0) scripts/removable_storage_watcher (+77/-0) scripts/run_compiz_check (+0/-27) scripts/sleep_test (+4/-37) scripts/usb_test (+0/-143) scripts/watch_command (+0/-159) setup.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~roadmr/ubuntu/precise/checkbox/0.13.1-retry |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Manrique (community) | Needs Resubmitting | ||
| Mathieu Trudel-Lapierre | Needs Fixing | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-02-01.
Description of the change
Hello,
The previous merge request was really borked, it was missing a bunch of scripts. Thanks for the thorough review, it enabled me to catch these problems as well as the ones you pointed out.
I've removed the checkbox-sru stuff that's no longer needed, and updated the changelog as per your suggestions, to more clearly document changes.
I noticed you commented about a change to jobs_prompt.py. This is trunk checkbox rev 1168, the matching changelog entry is the one for bug 509598.
Hopefully I didn't miss anything this time!
We will be more careful with our changelog entries in the future; that's what code review is for, I'll ask the Checkbox team to also take a moment to review changelog entries to make them clearer.
Thanks again for reviewing this!
To post a comment you must log in.
Revision history for this message
| Mathieu Trudel-Lapierre (cyphermox) wrote | # |
Revision history for this message
| Mathieu Trudel-Lapierre (cyphermox) wrote | # |
Download full text (4.6 KiB)
review:
Needs Fixing
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
- I see there are extra changes for a checkbox-sru script; they should either be added to changelog or dropped.
- There are also extra changes in install/postinst for update_
- there is no mention of the changes to jobs/local.txt.in for the command; changing from .../peripheral.txt to .../phoronix.txt looks rather unusual; and should be mentioned in syslog.
- changes to plugins/
- there appears to be extra changes to scripts/