Snapcraft

Merge lp://qastaging/~mvo/snapcraft/fix-snapcraft-plugin-dir into lp://qastaging/~snappy-dev/snapcraft/core

  1. fix-snapcraft-plugin-dir
  2. Merge into core
Proposed by Michael Vogt
Status: Merged
Approved by: Michael Terry
Approved revision: 91
Merged at revision: 91
Proposed branch: lp://qastaging/~mvo/snapcraft/fix-snapcraft-plugin-dir
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 12 lines (+1/-2)
1 file modified
snapcraft/dirs.py (+1/-2)
To merge this branch: bzr merge lp://qastaging/~mvo/snapcraft/fix-snapcraft-plugin-dir
Reviewer Review Type Date Requested Status
Michael Terry (community) Approve
Review via email: mp+265262@code.qastaging.launchpad.net

Commit message

Fix setting of snapcraft.common.plugindir (thanks to cjwatson).

Description of the change

Tiny branch that fixes snapcraft, thanks to cjwatson.

The new code only overrides the default plugin dir if its running
from a checkout. Otherwise the default from snapcraft.common.plugindir
is used.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Yup, makes sense. :) Whoops

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