Ubuntu

Merge lp:~lars.duesing/ubuntu/quantal/aiccu/aiccu-1007408 into lp:ubuntu/quantal/aiccu

Proposed by Lars Düsing on 2012-06-15
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~lars.duesing/ubuntu/quantal/aiccu/aiccu-1007408
Merge into: lp:ubuntu/quantal/aiccu
Diff against target: 29 lines (+9/-2) 2 files modified
To merge this branch: bzr merge lp:~lars.duesing/ubuntu/quantal/aiccu/aiccu-1007408
Reviewer Review Type Date Requested Status
James Page Approve on 2012-06-15
Ubuntu branches 2012-06-15 Pending
Review via email: mp+110498@code.launchpad.net

Description of the Change

Fixed Bug LP: #1007408
getting default server tic.sixxs.net honoured by upstart-script.
Test-Case: comment out the "server tic.sixxs.net"-line in /etc/aiccu.conf

To post a comment you must log in.
James Page (james-page) wrote :

Hi Lars

LGTM - uploaded.

review: Approve

Preview Diff

1=== modified file 'debian/aiccu.upstart'
2--- debian/aiccu.upstart 2012-04-02 11:40:44 +0000
3+++ debian/aiccu.upstart 2012-06-15 10:23:18 +0000
4@@ -65,8 +65,8 @@
5 # Workaround race with local DNS services
6 server=$(grep "^server" /etc/aiccu.conf | awk '{ print $2 }')
7 if [ -z "$server" ]; then
8- log "No server configuration specified"
9- exit 1
10+ log "No server configuration specified - defaulting to tic.sixxs.net"
11+ server="tic.sixxs.net"
12 fi
13 log "Checking access to $server: "
14 count=0
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2012-06-10 10:34:01 +0000
18+++ debian/changelog 2012-06-15 10:23:18 +0000
19@@ -1,3 +1,10 @@
20+aiccu (20070115-15ubuntu3) quantal; urgency=low
21+
22+ * upstart-script did not honour default server tic.sixxs.net
23+ (LP: #1007408)
24+
25+ -- Lars Duesing <lars.duesing@camelotsweb.de> Fri, 15 Jun 2012 11:58:43 +0200
26+
27 aiccu (20070115-15ubuntu2) quantal; urgency=low
28
29 * Add apport hook for /var/log/aiccu.log (LP: #1001432)

Subscribers

People subscribed via source and target branches

to all changes: