Landscape Client

Merge lp://staging/~tealeg/landscape-client/only-challenge-once into lp://staging/~landscape/landscape-client/trunk

  1. only-challenge-once
  2. Merge into trunk
Proposed by Geoff Teale
Status: Merged
Approved by: Thomas Herve
Approved revision: 491
Merged at revision: 492
Proposed branch: lp://staging/~tealeg/landscape-client/only-challenge-once
Merge into: lp://staging/~landscape/landscape-client/trunk
Diff against target: 114 lines (+13/-28)
7 files modified
debian/changelog (+6/-0)
debian/landscape-client-ui.install (+0/-1)
landscape/ui/lib/polkit.py (+3/-0)
landscape/ui/model/configuration/mechanism.py (+1/-2)
landscape/ui/model/registration/mechanism.py (+2/-2)
polkit-1/com.canonical.LandscapeClientRegistration.policy (+0/-21)
setup.py (+1/-2)
To merge this branch: bzr merge lp://staging/~tealeg/landscape-client/only-challenge-once
Reviewer Review Type Date Requested Status
Björn Tillenius (community) Approve
Thomas Herve (community) Approve
Mike Milner (community) Approve
Review via email: mp+96800@code.staging.launchpad.net

Description of the change

Fixes bug #949147

This branch makes both mechanisms share a common PolicyKit policy, and removes the second policy completely. This has the effect of removing the second policy kit challenge when registering / disabling as this is within the same policy (up to a timeout, and then you will be challenged again).

To post a comment you must log in.
Revision history for this message
Mike Milner (milner) wrote :

Looks good +1!

review: Approve
Revision history for this message
Thomas Herve (therve) wrote :

[1] The existing policy should mention that it gives the permission to register.

I don't think you should commit the changes in changelog, but otherwise it looks fine, +1!

review: Approve
Revision history for this message
Björn Tillenius (bjornt) wrote :

Looks good, +1!

[1]

+landscape-client (11.11-0ubuntu0.11.10.1) precise; urgency=low
+
+ * Remove com.canonical.LandscapeClientRegistration.policy file as this policy is no longer used.
+
+ -- Geoffrey Teale <email address hidden> Fri, 09 Mar 2012 18:24:08 +0100

Is this needed? I think we modify the changelog only when actually releasing the client, no?

review: Approve

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: