[PATCH 5/9] set $DEBIAN_MIRRORSITE in /etc/pbuilderrc
Loïc Minier
lool at dooz.org
Fri Jan 22 23:06:45 UTC 2010
On Sun, Jan 17, 2010, Loïc Minier wrote:
> ---
> debian/pbuilder.config | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/debian/pbuilder.config b/debian/pbuilder.config
> index 2e50015..d680303 100755
> --- a/debian/pbuilder.config
> +++ b/debian/pbuilder.config
> @@ -22,7 +22,7 @@ case "$1" in
>
> # if there is a custom file, then we shouldn't touch it
> if [ -f "$CONFFILE" ] ; then
> - CURRENTMIRROR=$(grep -E "^[ ]*MIRRORSITE=" "$CONFFILE" | sed 's#MIRRORSITE=##g')
> + CURRENTMIRROR=$(grep -E "^[ ]*DEBIAN_MIRRORSITE=" "$CONFFILE" | sed 's#^\s*DEBIAN_MIRRORSITE=##g')
Would be nice to merge with the commit introducing DEBIAN_MIRRORSITE.
> if [ "$CURRENTMIRROR" ] ; then
> db_input low pbuilder/rewrite || [ $? = 30 ]
> db_go
> @@ -85,7 +85,7 @@ EOF
> db_set pbuilder/mirrorsite "$MIRRORSITE"
> fi
>
> - sed -i "s#^\s*MIRRORSITE=.*\$#MIRRORSITE=$MIRRORSITE#" "$CONFFILE"
> + sed -i "s#^\s*DEBIAN_MIRRORSITE=.*\$#DEBIAN_MIRRORSITE=$MIRRORSITE#" "$CONFFILE"
>
> ;;
>
> --
> 1.6.5
>
>
> _______________________________________________
> Pbuilder-maint mailing list
> Pbuilder-maint at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pbuilder-maint
--
Loïc Minier
More information about the Pbuilder-maint
mailing list