[Pkg-awstats-devel] [Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/7.0_dfsg-1-4-gba398ca

[Sergey B Kirpichev]

Jonas, you just have reverted my changes
(3863aab0fd7bd21ccccd4edf8fd77b747d71d5f9) for bug #613524.

Why?

On Wed, Mar 16, 2011 at 8:55 PM, Jonas Smedegaard <dr at jones.dk> wrote:
> The following commit has been merged in the master branch:
> commit ba398cad57e015ca0f594b69a4e25bcb6524c37b
> Author: Jonas Smedegaard <dr at jones.dk>
> Date:   Wed Mar 16 18:54:45 2011 +0100
>
>    Resolve non-default configfile stems using find. Add comment on default config needing to be processed last.
>
> diff --git a/debian/buildstatic.sh b/debian/buildstatic.sh
> index 777e9df..1154a3b 100755
> --- a/debian/buildstatic.sh
> +++ b/debian/buildstatic.sh
> @@ -26,11 +26,12 @@ AWSTATS_LANG="en"
>
>  [ "$AWSTATS_ENABLE_BUILDSTATICPAGES" = "yes" ] || exit 0
>
> -# Resolve stems of available configfiles
> -cfgfiles=`find /etc/awstats -name awstats.conf -or -name 'awstats.*.conf' \
> -       | sed -e 's/\.conf$//;s/^.*\///;s/^awstats\.//'`
> +# Resolve stems of available non-default configfiles
> +cfgfiles=`find /etc/awstats -name 'awstats.*.conf' \
> +       | sed -e 's/\.conf$//;s/^.*\/awstats\.//'`
>
> -for c in $cfgfiles
> +# process first non-default then default configfiles (see bug#580699)
> +for c in $cfgfiles awstats
>  do
>   mkdir -p /var/cache/awstats/$c/$YEAR/$MONTH/
>
> diff --git a/debian/update.sh b/debian/update.sh
> index 4ab1c6c..188b3ed 100755
> --- a/debian/update.sh
> +++ b/debian/update.sh
> @@ -19,11 +19,12 @@ trap 'rm -f $ERRFILE' INT QUIT TERM EXIT
>  AWSTATS_NICE=10
>  [ ! -r "$DEFAULT" ] || . "$DEFAULT"
>
> -# Resolve stems of available configfiles
> -cfgfiles=`find /etc/awstats -name awstats.conf -or -name 'awstats.*.conf' \
> -       | sed -e 's/\.conf$//;s/^.*\///;s/^awstats\.//'`
> +# Resolve stems of available non-default configfiles
> +cfgfiles=`find /etc/awstats -name 'awstats.*.conf' \
> +       | sed -e 's/\.conf$//;s/^.*\/awstats\.//'`
>
> -for c in $cfgfiles
> +# process first non-default then default configfiles (see bug#580699)
> +for c in $cfgfiles awstats
>  do
>   if ! nice -n $AWSTATS_NICE $AWSTATS \
>          -config=$c \
>
> --
> awstats Debian packaging
>
> _______________________________________________
> Pkg-awstats-commits mailing list
> Pkg-awstats-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-awstats-commits
>