Author: vorlon Date: 2006-06-06 21:07:12 -0400 (Tue, 06 Jun 2006) New Revision: 2287
Modified: trunk/debian/xorg/debian/changelog trunk/debian/xorg/debian/x11-common.preinst.in Log: Fix bad shell in the x11-common.preinst. true || false && exit 1 is not the same thing as true || (false && exit 1) ! Modified: trunk/debian/xorg/debian/changelog =================================================================== --- trunk/debian/xorg/debian/changelog 2006-06-06 18:14:45 UTC (rev 2286) +++ trunk/debian/xorg/debian/changelog 2006-06-07 01:07:12 UTC (rev 2287) @@ -11,17 +11,18 @@ * Conflict with guitar, which also ships an empty /usr/X11R6/bin. * Bump conflict with xorg 6.9 packages to (<< 7.0), thanks to amd64 binNMUs. :/ Closes: #370215. + * Fix bad shell in the x11-common.preinst. [ David Nusinow ] * Add conflicts on some old woody stuff, including xftp, xext, xpaste, and ghostview. Thanks Carl Miller and Roger Leigh. (closes: #362915, #370088) - + [ Josh Triplett ] * Add conflicts on the old non-free package xv, no longer in Debian, which broke upgrading on at least one system. * Remove duplicated dependency on libx11-dev from xorg-dev. - -- David Nusinow <[EMAIL PROTECTED]> Sun, 4 Jun 2006 15:20:19 -0400 + -- Steve Langasek <[EMAIL PROTECTED]> Tue, 6 Jun 2006 17:58:47 -0700 xorg (1:7.0.20) unstable; urgency=low Modified: trunk/debian/xorg/debian/x11-common.preinst.in =================================================================== --- trunk/debian/xorg/debian/x11-common.preinst.in 2006-06-06 18:14:45 UTC (rev 2286) +++ trunk/debian/xorg/debian/x11-common.preinst.in 2006-06-07 01:07:12 UTC (rev 2287) @@ -46,7 +46,12 @@ # We need to remove /usr/X11R6/bin so we can replace it with a symlink if [ -d "/usr/X11R6/bin" ] && [ ! -L /usr/X11R6/bin ]; then - rmdir "/usr/X11R6/bin" || run db_fset x11-common/x11r6_bin_not_empty seen false && run db_input critical x11-common/x11r6_bin_not_empty && run db_go && exit 1 + if ! rmdir "/usr/X11R6/bin"; then + run db_fset x11-common/x11r6_bin_not_empty seen false + run db_input critical x11-common/x11r6_bin_not_empty + run db_go + exit 1 + fi fi # migration hilarity -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]