Unity 8

Merge lp:~unity-team/unity8/unity8-silence-typeerror into lp:unity8

  1. unity8-silence-typeerror
  2. Merge into trunk
Proposed by Michał Karnicki
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 688
Merged at revision: 737
Proposed branch: lp:~unity-team/unity8/unity8-silence-typeerror
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
qml/Dash/GenericScopeView.qml (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity8/unity8-silence-typeerror
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Albert Astals Cid (community) Approve
Review via email: mp+205266@code.launchpad.net

Commit message

Take it easy on the logging.

Description of the change

Silence multiple instances of
file:///home/karni/src/canonical/unity8/newscopes-card-overlay/qml/Dash/GenericScopeView.qml:291: TypeError: Cannot read property 'category' of null

 * Are there any related MPs required for this MP to build/function as expected? Please list.
  No.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
  Yes.
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
  N/A
 * If you changed the UI, has there been a design review?
  N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:686
http://jenkins.qa.ubuntu.com/job/unity8-ci/2263/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2992
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2725
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/787
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/787/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2994
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2994/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2726
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2726/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5146
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3726

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2263/rebuild

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

I'd just add ""

Also you need https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

review: Needs Fixing
lp:~unity-team/unity8/unity8-silence-typeerror updated
687. By Michał Karnicki

Change string.

688. By Michał Karnicki

Merge trunk.

Revision history for this message
Albert Astals Cid (aacid) wrote :

* Did you perform an exploratory manual test run of the code change and any related functionality?
No, it just affects objectName

* Did CI run pass?
Yes

Revision history for this message
Albert Astals Cid (aacid) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:688
http://jenkins.qa.ubuntu.com/job/unity8-ci/2391/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3439
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3082/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/916
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/916/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3442
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3084
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3084/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5475/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4222

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2391/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/GenericScopeView.qml'
2--- qml/Dash/GenericScopeView.qml 2014-02-05 08:20:25 +0000
3+++ qml/Dash/GenericScopeView.qml 2014-02-24 10:35:09 +0000
4@@ -287,7 +287,7 @@
5
6 sectionProperty: "name"
7 sectionDelegate: ListItems.Header {
8- objectName: "dashSectionHeader" + delegate.category
9+ objectName: "dashSectionHeader" + (delegate ? delegate.category : "")
10 property var delegate: categoryView.item(delegateIndex)
11 width: categoryView.width
12 text: section

Subscribers

People subscribed via source and target branches