Merge lp:~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/quantal/pam/lp110287 into lp:~ubuntu-core-dev/pam/ubuntu

[Nathan Williams]

add /usr/local/games to PATH

[Steve Langasek (vorlon)]

Thanks, this patch looks good. Committing and uploading!

FWIW:

-if [ "$1" = "configure" ] && (dpkg --compare-versions 0.79-3ubuntu6 ge "$2" || [ "$2" = "" ]); then
+if [ "$1" = "configure" ] && (dpkg --compare-versions 1.1.3-7ubuntu2 ge "$2" || [ "$2" = "" ]); then

I think the original wasn't very well written here, and I'm going to clean it up as part of the merge to read:

+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le 1.1.3-7ubuntu2; then

[Steve Langasek (vorlon)]

In fact, make that...

if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt 1.1.3-7ubuntu3; then

thus keying on the version that *does* introduce the change, rather than on the last known version that doesn't.

[Steve Langasek (vorlon)]

Whoops, one more issue, caught on package install test:

- elif ! grep -qs "^PATH.*/usr/local/games"; then
+ elif ! grep -qs "^PATH.*/usr/local/games" /etc/environment; then

postinst hanging forever is not the desired behavior :)

[Nathan Williams (nathwill-deactivatedaccount-deactivatedaccount)]

ugh. fixed that. thanks for catching. went ahead and flipped the dpkg version comparison as recommended. left the empty string comparison, because i believe that accounts for the new-install scenario?

[Steve Langasek (vorlon)]

On Tue, Jul 03, 2012 at 07:09:22AM -0000, Nathan Williams wrote:

> ugh. fixed that. thanks for catching. went ahead and flipped the dpkg
> version comparison as recommended. left the empty string comparison,
> because i believe that accounts for the new-install scenario?

dpkg --compare-versions lt knows that an empty string "" is less than any
other version, so it already does the right thing here. (In fact,
--compare-versions has a separate operator, 'lt-nl', to exclude empty
version strings as "not less than".)

Uploaded now, anyway :)

--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
<email address hidden> <email address hidden>

=== modified file 'debian/libpam-modules.postinst'
--- debian/libpam-modules.postinst	2011-02-18 00:15:43 +0000
+++ debian/libpam-modules.postinst	2012-06-30 20:47:18 +0000
@@ -19,10 +19,12 @@
 
 # Add PATH to /etc/environment if it's not present there or in
 # /etc/security/pam_env.conf
-if [ "$1" = "configure" ] && (dpkg --compare-versions 0.79-3ubuntu6 ge "$2" || [ "$2" = "" ]); then
+if [ "$1" = "configure" ] && (dpkg --compare-versions 1.1.3-7ubuntu2 ge "$2" || [ "$2" = "" ]); then
 	if ! grep -qs ^PATH /etc/security/pam_env.conf; then
 		if ! grep -qs ^PATH /etc/environment; then
-			echo 'PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"' >> /etc/environment
+			echo 'PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"' >> /etc/environment
+		elif ! grep -qs "^PATH.*/usr/local/games"; then
+			sed -i 's/:\/usr\/games/:\/usr\/games:\/usr\/local\/games/g' /etc/environment
 		fi
 	fi
 fi