MAAS

Merge lp:~jtv/maas/p-sru-pkg-bug-1089508 into lp:~maas-maintainers/maas/packaging.precise.sru

  1. p-sru-pkg-bug-1089508
  2. Merge into packaging.precise.sru
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 151
Proposed branch: lp:~jtv/maas/p-sru-pkg-bug-1089508
Merge into: lp:~maas-maintainers/maas/packaging.precise.sru
Diff against target: 14 lines (+1/-3)
1 file modified
debian/maas-cluster-controller.postinst (+1/-3)
To merge this branch: bzr merge lp:~jtv/maas/p-sru-pkg-bug-1089508
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+139606@code.launchpad.net

Commit message

Backport packaging r157: handle single-quoted CLUSTER_UUID in migration to maas_cluster.conf.

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Straight backport. Self-approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-cluster-controller.postinst'
2--- debian/maas-cluster-controller.postinst 2012-12-12 07:14:04 +0000
3+++ debian/maas-cluster-controller.postinst 2012-12-13 02:30:26 +0000
4@@ -30,9 +30,7 @@
5 # Extract ClUSTER_UUID setting from config file $1. This will work
6 # both the cluster celery config (which is python) and the cluster
7 # config (which is shell).
8- local config_file="$1"
9- grep "^CLUSTER_UUID *= *[\"'][^\"']*[\"']" $config_file |
10- sed -e "s/^CLUSTER_UUID *= *\"\([^\"']*\)\".*/\1/"
11+ sed -n -e "s/^CLUSTER_UUID *= *[\"']\([^\"']*\).*/\1/p" "$1"
12 }
13
14 configure_cluster_uuid(){

Subscribers

People subscribed via source and target branches