Merge ~axino/apache-openid-charm/+git/apache-openid-charm:fix_stop into apache-openid-charm:master

Proposed by Junien F
Status: Merged
Approved by: Laurent Sesquès
Approved revision: 8c1121c0be079afe3aa83ce778d3e9099609d08b
Merged at revision: f34e910243d4db8961f0a0b2f19272d77dc15172
Proposed branch: ~axino/apache-openid-charm/+git/apache-openid-charm:fix_stop
Merge into: apache-openid-charm:master
Diff against target: 34 lines (+0/-9)
2 files modified
dev/null (+0/-1)
hooks/hooks.py (+0/-8)
Reviewer Review Type Date Requested Status
Laurent Sesquès Approve
Review via email: mp+353863@code.launchpad.net

Commit message

disable the "stop" hook

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Laurent Sesquès (sajoupa) wrote :

lets keep it simple. +1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision f34e910243d4db8961f0a0b2f19272d77dc15172

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/hooks.py b/hooks/hooks.py
2index 5f5a012..d99e4b1 100755
3--- a/hooks/hooks.py
4+++ b/hooks/hooks.py
5@@ -177,12 +177,6 @@ def hook_start():
6 return 0
7
8
9-def hook_stop():
10- a2dismod("python")
11- run(["service", "apache2", "reload"])
12- return 0
13-
14-
15 def main():
16 hook_name = os.path.basename(sys.argv[0])
17 config = config_get()
18@@ -200,8 +194,6 @@ def main():
19 sys.exit(hook_config_changed(config))
20 elif hook_name == "start":
21 sys.exit(hook_start())
22- elif hook_name == "stop":
23- sys.exit(hook_stop())
24 else:
25 print "Unsupported hook: %s" % hook_name
26 sys.exit(0)
27diff --git a/hooks/stop b/hooks/stop
28deleted file mode 120000
29index 9416ca6..0000000
30--- a/hooks/stop
31+++ /dev/null
32@@ -1 +0,0 @@
33-hooks.py
34\ No newline at end of file

Subscribers

People subscribed via source and target branches