[26160] in Source-Commits
Re: /svn/athena r25427 - in trunk/debathena/debathena/config-package-dev:
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Tue Oct 25 20:32:01 2011
Date: Tue, 25 Oct 2011 20:31:59 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Anders Kaseorg <andersk@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201110260030.p9Q0U0lg022365@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1110252031270.29514@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: MULTIPART/MIXED; BOUNDARY="-1156401407-1578716312-1319589119=:29514"
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
---1156401407-1578716312-1319589119=:29514
Content-Type: TEXT/PLAIN; charset=UTF-8; format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
LC_ALL=3DC ACK
--=20
Geoffrey Thomas
geofft@mit.edu
On Tue, 25 Oct 2011, Anders Kaseorg wrote:
> Author: andersk
> Date: 2011-10-25 20:30:00 -0400 (Tue, 25 Oct 2011)
> New Revision: 25427
>
> Modified:
> trunk/debathena/debathena/config-package-dev/check-files.mk
> trunk/debathena/debathena/config-package-dev/debian/changelog
> trunk/debathena/debathena/config-package-dev/divert.sh.in
> Log:
> In config-package-dev:
> * Set LC_ALL=3DC when matching potentially localized dpkg output.
>
>
> Modified: trunk/debathena/debathena/config-package-dev/check-files.mk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/check-files.mk=092011-10=
-26 00:13:50 UTC (rev 25426)
> +++ trunk/debathena/debathena/config-package-dev/check-files.mk=092011-10=
-26 00:30:00 UTC (rev 25427)
> @@ -61,7 +61,7 @@
> $(call debian_check_files_tmp,%): target =3D $(call undebian_check_files_=
tmp,$@)
> $(call debian_check_files_tmp,%): name =3D $(call debian_check_files_chec=
k,$(target))
> $(call debian_check_files_tmp,%): truename =3D $(shell /usr/sbin/dpkg-div=
ert --truename $(name))
> -$(call debian_check_files_tmp,%): package =3D $(shell dpkg -S $(name) | =
sed -n '/^diversion by /! s/: .*$$// p')
> +$(call debian_check_files_tmp,%): package =3D $(shell LC_ALL=3DC dpkg -S=
$(name) | sed -n '/^diversion by /! s/: .*$$// p')
> $(call debian_check_files_tmp,%): $(truename)
> =09[ -n "$(package)" ]
> =09mkdir -p $(@D)
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/debian/changelog=092011-=
10-26 00:13:50 UTC (rev 25426)
> +++ trunk/debathena/debathena/config-package-dev/debian/changelog=092011-=
10-26 00:30:00 UTC (rev 25427)
> @@ -4,10 +4,11 @@
> Multi-Arch: same packages.
> * Fix encode script to work with Perl 5.12. While we=E2=80=99re at it,=
turn on
> strict and warnings.
> + * Set LC_ALL=3DC when matching potentially localized dpkg output.
> * Bump Standards-Version to 3.9.2 (no changes required).
> * Add Vcs-Git, Vcs-Browser.
>
> - -- Anders Kaseorg <andersk@mit.edu> Tue, 25 Oct 2011 20:08:02 -0400
> + -- Anders Kaseorg <andersk@mit.edu> Tue, 25 Oct 2011 20:26:50 -0400
>
> config-package-dev (4.12) unstable; urgency=3Dlow
>
>
> Modified: trunk/debathena/debathena/config-package-dev/divert.sh.in
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/debathena/config-package-dev/divert.sh.in=092011-10-2=
6 00:13:50 UTC (rev 25426)
> +++ trunk/debathena/debathena/config-package-dev/divert.sh.in=092011-10-2=
6 00:30:00 UTC (rev 25427)
> @@ -24,7 +24,7 @@
> file=3D$1
> ourfile=3D$2
> theirfile=3D$3
> - if ! dpkg-divert --list "$package" | \
> + if ! LC_ALL=3DC dpkg-divert --list "$package" | \
> =09grep -xFq "diversion of $file to $theirfile by $package"; then
> =09dpkg-divert --divert "$theirfile" --rename --package "$package" --add =
"$file"
> fi
> @@ -116,7 +116,7 @@
> ourfile=3D$prefix$ours$suffix
> theirfile=3D$prefix$theirs$suffix
>
> - if dpkg-divert --list "$package" | \
> + if LC_ALL=3DC dpkg-divert --list "$package" | \
> =09grep -xFq "diversion of $file to $theirfile by $package"; then
> =09undivert_unlink "$prefix" "$suffix"
> fi
> @@ -126,7 +126,7 @@
> {
> file=3D$1
> removedfile=3D$2
> - if dpkg-divert --list "$package" | \
> + if LC_ALL=3DC dpkg-divert --list "$package" | \
> =09grep -xFq "diversion of $file to $removedfile by $package"; then
> =09undivert_unremove "$file"
> fi
>
>
---1156401407-1578716312-1319589119=:29514--
