lp://staging/~tribaal/landscape-client/extra-logging-info

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~landscape/landscape-client/trunk at revision 775

Alberto Donato: Approve on 2014-06-19

Free Ekanayaka (community): Approve on 2014-06-19

Diff: 135 lines (+27/-17)

2 files modified

landscape/broker/registration.py (+3/-3)
landscape/broker/tests/test_registration.py (+24/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

777. By Chris Glass on 2014-06-20

Split log assertions in a more readble way

776. By Chris Glass on 2014-06-19

Fixed tests checking log output

775. By Chris Glass on 2014-06-19

Switched extra logging to using info instead of debug to make them visible in non-debug situations.

774. By Chris Glass on 2014-06-19

Merge extra-logging [f=] [r=bjornt,benji] [a=Chris Glass]
This branch adds some extra debug logging to the registration code.

773. By Björn Tillenius on 2014-06-18

Merge trusty-apt-change [f=1326940] [r=adam-collard,free.ekanayaka] [a=Björn Tillenius]
Handle broken packages in Trusty.

The apt library changed in Trusty when it comes to dealing with broken
packages. Before Trusty, if a package couldn't be installed due to
dependency issues, is_inst_broken was set to True. In Trusty,
is_inst_broken is True only for packages that are already installed and
broken. For packages that can't be installed, the marked_installation, marked_upgrade and marked_downgrade attributes are simply cleared.

The changes in the AptFacade aren't that big. We now keep track of which
packages we request and check whether it's still marked to be installed,
upgraded or downgraded.

The tests used the apt package directly to change the install state, so
I had to change them to use the facade instead. Otherwise the facade
won't know that the packages are broken.

I also had to change some tests that check for error messages, since
those change in Trusty as well.

The tests pass on both Trusty and Precise.

772. By Benji York on 2014-06-16

Merge create-empty-apt-keyring-for-trusty [f=1326078] [r=ack,bjornt] [a=Benji York]
Bug 1326078 was caused by apt on trusty requiring a keyring file (even if
empty) exist in its directory structure. Since we create a fake directory
structure for it to operate on, we need to create a keyring too.

771. By Adam Collard on 2014-06-16

Merge sock-in-panel [f=1317928] [r=ack,tealeg] [a=Adam Collard]
Replace the icon in the Unity Control Center (System Settings) dialog to use the new Landscape icon.

The associated UI with registering a machine with Landscape also uses the same icon.

770. By Chris Glass on 2014-06-11

Merge revert-weird-merge-error [f=1325599] [r=bjornt,ack] [a=Chris Glass]
This is basically a resubmit of https://code.launchpad.net/~tribaal/landscape-client/multiple-juju-unit-files
since the last merge of trunk in this branch just before landing seems to have
reverted all meaningful changes.

769. By Chris Glass on 2014-06-06

Merge multiple-juju-unit-files [f=1325599] [r=ack,free.ekanayaka] [a=Chris Glass]
This branch creates a juju-info.d/ directory in the landscape-client data path, and reads all files matching *.json in this directory as a separate juju-info file.

It then reports juju-info lists to the server, either in the registration message or using a new message (to send a list of "juju info" instead of just one).

768. By Adam Collard on 2014-06-05

Revert r767 due to broken server imports [r=chad.smith]

bzr merge -r 767..766