Snappy Scope

Merge lp://staging/~kyrofa/unity-scope-snappy/progress_daemon_add_dbus_lib into lp://staging/~unity-api-team/unity-scope-snappy/trunk

progress_daemon_add_dbus_lib
Merge into trunk

Proposed by Kyle Fazzari on 2015-06-12

Status:	Merged
Approved by:	Kyle Fazzari on 2015-06-19
Approved revision:	30
Merged at revision:	14
Proposed branch:	lp://staging/~kyrofa/unity-scope-snappy/progress_daemon_add_dbus_lib
Merge into:	lp://staging/~unity-api-team/unity-scope-snappy/trunk
Prerequisite:	lp://staging/~kyrofa/unity-scope-snappy/humanized_size
Diff against target:	6286 lines (+5919/-32) 49 files modified debian/copyright (+25/-1) internal/github.com/godbus/dbus/CONTRIBUTING.md (+50/-0) internal/github.com/godbus/dbus/LICENSE (+25/-0) internal/github.com/godbus/dbus/MAINTAINERS (+2/-0) internal/github.com/godbus/dbus/README.markdown (+38/-0) internal/github.com/godbus/dbus/auth.go (+253/-0) internal/github.com/godbus/dbus/auth_external.go (+26/-0) internal/github.com/godbus/dbus/auth_sha1.go (+102/-0) internal/github.com/godbus/dbus/call.go (+147/-0) internal/github.com/godbus/dbus/conn.go (+609/-0) internal/github.com/godbus/dbus/conn_darwin.go (+21/-0) internal/github.com/godbus/dbus/conn_other.go (+27/-0) internal/github.com/godbus/dbus/conn_test.go (+199/-0) internal/github.com/godbus/dbus/dbus.go (+258/-0) internal/github.com/godbus/dbus/decoder.go (+228/-0) internal/github.com/godbus/dbus/doc.go (+63/-0) internal/github.com/godbus/dbus/encoder.go (+208/-0) internal/github.com/godbus/dbus/encoder_test.go (+58/-0) internal/github.com/godbus/dbus/examples_test.go (+50/-0) internal/github.com/godbus/dbus/export.go (+302/-0) internal/github.com/godbus/dbus/homedir.go (+28/-0) internal/github.com/godbus/dbus/homedir_dynamic.go (+15/-0) internal/github.com/godbus/dbus/homedir_static.go (+45/-0) internal/github.com/godbus/dbus/introspect/call.go (+27/-0) internal/github.com/godbus/dbus/introspect/introspect.go (+86/-0) internal/github.com/godbus/dbus/introspect/introspectable.go (+75/-0) internal/github.com/godbus/dbus/message.go (+346/-0) internal/github.com/godbus/dbus/proto_test.go (+369/-0) internal/github.com/godbus/dbus/sig.go (+257/-0) internal/github.com/godbus/dbus/sig_test.go (+70/-0) internal/github.com/godbus/dbus/transport_darwin.go (+6/-0) internal/github.com/godbus/dbus/transport_generic.go (+35/-0) internal/github.com/godbus/dbus/transport_unix.go (+196/-0) internal/github.com/godbus/dbus/transport_unix_test.go (+49/-0) internal/github.com/godbus/dbus/transport_unixcred_dragonfly.go (+95/-0) internal/github.com/godbus/dbus/transport_unixcred_linux.go (+25/-0) internal/github.com/godbus/dbus/variant.go (+139/-0) internal/github.com/godbus/dbus/variant_lexer.go (+284/-0) internal/github.com/godbus/dbus/variant_parser.go (+817/-0) internal/github.com/godbus/dbus/variant_test.go (+78/-0) internal/golang.org/x/tools/cover/profile.go (+1/-1) internal/launchpad.net/go-unityscopes/v2/export_test.go (+13/-0) internal/launchpad.net/go-unityscopes/v2/metadata.cpp (+10/-0) internal/launchpad.net/go-unityscopes/v2/metadata.go (+43/-0) internal/launchpad.net/go-unityscopes/v2/metadata_test.go (+27/-0) internal/launchpad.net/go-unityscopes/v2/shim.cpp (+15/-0) internal/launchpad.net/go-unityscopes/v2/shim.h (+6/-0) internal/launchpad.net/go-unityscopes/v2/unityscope.go (+22/-0) internal/vendor.json (+49/-30)
To merge this branch:	bzr merge lp://staging/~kyrofa/unity-scope-snappy/progress_daemon_add_dbus_lib
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Xavi Garcia (community)		2015-06-17	Approve on 2015-06-19
PS Jenkins bot (community)	continuous-integration		Approve on 2015-06-18
Unity API Team		2015-06-12	Pending
Review via email: mp+261874@code.staging.launchpad.net

Commit message

Vendor godbus for the progress daemon.

Description of the change

Vendor godbus for the progress daemon.

This MR is really just to verify that the copyright file still looks good. Nothing else in the package changed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-15:

FAILED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/4/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/4/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-15:

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/16/rebuild

review: Approve (continuous-integration)

lp://staging/~kyrofa/unity-scope-snappy/progress_daemon_add_dbus_lib updated on 2015-06-17

28. By Kyle Fazzari on 2015-06-17: Merge prerequisite changes from lp:~kyrofa/unity-scope-snappy/humanized_size

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-17:

PASSED: Continuous integration, rev:28
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/25/rebuild

review: Approve (continuous-integration)

Revision history for this message

Xavi Garcia (xavi-garcia-mena) wrote on 2015-06-18:

The only thing I noticed is that we have 4 entries like this:
  {
   "canonical": "launchpad.net/go-unityscopes/v2",
   "comment": "",
   "local": "launchpad.net/unity-scope-snappy/internal/launchpad.net/go-unityscopes/v2",
   "revision": "68",
   "revisionTime": "2015-04-29T15:27:46+01:00"
  }

in the vendor.json file.

All 4 entries have the same values.

Am I missing something here?

review: Needs Information

lp://staging/~kyrofa/unity-scope-snappy/progress_daemon_add_dbus_lib updated on 2015-06-18

29. By Kyle Fazzari on 2015-06-18

Remove duplicates in internal/vendor.json.

Also update the vendored go-unityscopes lib.

Revision history for this message

Kyle Fazzari (kyrofa) wrote on 2015-06-18:

Ah, good catch. No, you're not missing anything-- looks like bzr didn't merge those files correctly. I've fixed it in the most recent commit, and I'll keep an eye on it in the future. Thanks!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-18:

FAILED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/30/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/30/console