dee

Merge lp://qastaging/~mhr3/dee/fix-1100303 into lp://qastaging/dee

  1. fix-1100303
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Michal Hruby
Approved revision: 401
Merged at revision: 400
Proposed branch: lp://qastaging/~mhr3/dee/fix-1100303
Merge into: lp://qastaging/dee
Diff against target: 340 lines (+47/-12)
23 files modified
bindings/python/Dee.py (+3/-3)
examples/master-model.c (+2/-0)
examples/peers.c (+2/-0)
examples/slave-model.c (+2/-0)
tests/model-helper-add3rows.c (+2/-0)
tests/model-helper-append1.c (+2/-0)
tests/model-helper-change3rows.c (+2/-0)
tests/model-helper-clear3add5.c (+2/-0)
tests/model-helper-clear3rows.c (+2/-0)
tests/model-helper-clear6rows.c (+2/-0)
tests/model-helper-clone3rows-meta.c (+2/-1)
tests/model-helper-clone3rows.c (+2/-1)
tests/model-helper-insert1row.c (+2/-0)
tests/model-helper-introspect.c (+2/-1)
tests/model-helper-remove3rows.c (+2/-1)
tests/model-helper-replace.c (+2/-1)
tests/model-helper-resync3rows.c (+2/-1)
tests/model-helper-schemaless.c (+2/-1)
tests/peer-helper-1peer.c (+2/-1)
tests/server-helper-client.c (+2/-1)
tests/test-benchmark.c (+2/-0)
tests/test-dee.c (+2/-0)
tools/dee-tool.c (+2/-0)
To merge this branch: bzr merge lp://qastaging/~mhr3/dee/fix-1100303
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+143572@code.qastaging.launchpad.net

Commit message

Fix compability with python3

Description of the change

Fix compability with python3

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

FAILED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/11/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/11//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/12/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/12//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/13/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/13//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/dee-mbs-autolanding/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/35/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Autolanding failed:
master-model.c: In function 'main':
master-model.c:54:3: error: 'g_type_init' is deprecated (declared at /usr/include/glib-2.0/gobject/gtype.h:669) [-Werror=deprecated-declarations]
cc1: all warnings being treated as errors

The -ci job was building under quantal, the -autolanding job is using raring. This led to the failure as raring is using 2.35.4-0ubuntu5 while quantal is on 2.34.0-1ubuntu1.

My apologies for the jenkins issues with this MP. The -ci job has been updated to raring.

lp://qastaging/~mhr3/dee/fix-1100303 updated
401. By Michal Hruby

Remove the deprecated calls to g_type_init

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:401
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=raring,flavor=amd64/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=raring,flavor=i386/14/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/14//rebuild/?

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: