[25990] in Source-Commits
Re: /svn/athena r25292 r25293 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Sat Jul 30 23:05:49 2011
Date: Sat, 30 Jul 2011 23:05:41 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201107271731.p6RHVsUN028340@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1107302304450.7526@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
Feels like a sledgehammer to remove them in postinst, postrm, and preinst
all three, but ACK 25292 and 25293 nonetheless.
-Ben
On Wed, 27 Jul 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-07-27 13:31:54 -0400 (Wed, 27 Jul 2011)
> New Revision: 25292
>
> Modified:
> trunk/debathena/config/cluster-login-config/debian/changelog
> trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
> trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postrm
> trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.preinst
> Log:
> In cluster-login-config:
> * Correctly punt the conffiles we removed in 1.36
>
>
> Modified: trunk/debathena/config/cluster-login-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-27 16:35:14 UTC (rev 25291)
> +++ trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-27 17:31:54 UTC (rev 25292)
> @@ -1,3 +1,9 @@
> +debathena-cluster-login-config (1.36.2) unstable; urgency=low
> +
> + * Correctly punt the conffiles we removed in 1.36
> +
> + --
> +
> debathena-cluster-login-config (1.36.1) unstable; urgency=low
>
> * Punt the conffiles we removed in 1.36
>
> Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-07-27 16:35:14 UTC (rev 25291)
> +++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-07-27 17:31:54 UTC (rev 25292)
> @@ -89,15 +89,15 @@
> rm_conffile debathena-cluster-login-config "/etc/init/ttymsg.conf"
> fi
>
> - if dpkg --compare-versions "$2" lt '1.36.1~'; then
> + if dpkg --compare-versions "$2" lt '1.36.2~'; then
> # Cleanup from previous installs
> # /etc/apt/preferences was frobbed due to (LP:508545)
> if grep -qxF "Package: libstdc++5" /etc/apt/preferences 2>/dev/null; then
> rm /etc/apt/preferences
> fi
> # Cleanup conffiles
> - rm -f /etc/apt/sources.list.d/debathena-backports.list
> - rm -f /etc/apt/preferences.d/debathena-libstdcplusplus.pref
> + rm_conffile debathena-cluster-login-config /etc/apt/sources.list.d/debathena-backports.list
> + rm_conffile debathena-cluster-login-config /etc/apt/preferences.d/debathena-libstdcplusplus.pref
> fi
>
> if dpkg --compare-versions "$2" lt 1.35.2~; then
>
> Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postrm
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postrm 2011-07-27 16:35:14 UTC (rev 25291)
> +++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postrm 2011-07-27 17:31:54 UTC (rev 25292)
> @@ -33,6 +33,11 @@
> rm_conffile debathena-cluster-login-config "/etc/event.d/ttymsg"
> rm_conffile debathena-cluster-login-config "/etc/init/ttymsg.conf"
> fi
> +
> + if dpkg --compare-versions "$2" lt 1.36.2~; then
> + rm_conffile debathena-cluster-login-config /etc/apt/sources.list.d/debathena-backports.list
> + rm_conffile debathena-cluster-login-config /etc/apt/preferences.d/debathena-libstdcplusplus.pref
> + fi
> ;;
>
> purge|remove|upgrade|failed-upgrade|disappear)
>
> Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.preinst
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.preinst 2011-07-27 16:35:14 UTC (rev 25291)
> +++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.preinst 2011-07-27 17:31:54 UTC (rev 25292)
> @@ -39,6 +39,12 @@
> rm_conffile debathena-cluster-login-config "/etc/event.d/ttymsg"
> rm_conffile debathena-cluster-login-config "/etc/init/ttymsg.conf"
> fi
> +
> + if dpkg --compare-versions "$2" lt 1.36.2~; then
> + rm_conffile debathena-cluster-login-config /etc/apt/sources.list.d/debathena-backports.list
> + rm_conffile debathena-cluster-login-config /etc/apt/preferences.d/debathena-libstdcplusplus.pref
> + fi
> +
> ;;
>
> abort-upgrade)
>
>
