diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2006-10-07 17:41:28 +0000 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2006-10-07 17:41:28 +0000 |
| commit | a0d61b69a3965741370f1fcd9232aa3d007133d0 (patch) | |
| tree | 6294a2bc60bbb153531be3c5bb3c35c4d8367a1b | |
| parent | a80eb827e971c8add29a0599d1c927aeaf76b6ce (diff) | |
| download | sitesummary-a0d61b69a3965741370f1fcd9232aa3d007133d0.tar.gz sitesummary-a0d61b69a3965741370f1fcd9232aa3d007133d0.tar.bz2 sitesummary-a0d61b69a3965741370f1fcd9232aa3d007133d0.tar.xz | |
Make sure the debconf value only is set in sitesummary-client.config when local configuration exist.
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/sitesummary-client.config | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 5045149..5ef8bec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ sitesummary (0.0.15) unstable; urgency=low [ Steffen Joeris ] - * Remove code to set the debconf value explicitely in the - sitesummary-client.config script to avoid possible conflict - (Closes: #391593) + * Remove code to set the debconf value explicitely in the + sitesummary-client.config script to avoid possible conflict + (Closes: #391593) + + [ Petter Reinholdtsen ] + * Make sure the debconf value only is set in sitesummary-client.config + when local configuration exist. -- Steffen Joeris <white@skolelinux.org> Sun, 8 Oct 2006 00:06:51 +1000 diff --git a/debian/sitesummary-client.config b/debian/sitesummary-client.config index e6f95b0..8ecb064 100644 --- a/debian/sitesummary-client.config +++ b/debian/sitesummary-client.config @@ -3,6 +3,8 @@ # if we do not have debconf, we just skip this . /usr/share/debconf/confmodule || exit 0 +updatedebconf=no + # Read the package default, need to match the code in sitesummary-client [ -f /usr/share/sitesummary/sitesummary-client.conf ] && \ . /usr/share/sitesummary/sitesummary-client.conf @@ -12,10 +14,15 @@ for confdir in \ do [ -d $confdir ] || continue for config in $confdir/* ; do - [ -f $config ] && . $config + if [ -f $config ] ;then + . $config + updatedebconf=yes + fi done done +[ yes = "$updatedebconf" ] && db_set sitesummary-client/collector_url "$serverurls" + db_input medium sitesummary-client/collector_url || true db_go || true |