tags 700820 +patch
thanks
Hi,
I have prepared a patch that fixes the issue, by adding a --non-interactive
flag to the script called by the postinst script. This way, the postinst
doesn't prompt but if called by the user, the script will prompt as it did
before.
I've also updated the manpage.
I will upload this to the 7 day delayed queue.
--
Regards,
Marga
diff -u t1lib-5.1.2/debian/changelog t1lib-5.1.2/debian/changelog
--- t1lib-5.1.2/debian/changelog
+++ t1lib-5.1.2/debian/changelog
@@ -1,3 +1,11 @@
+t1lib (5.1.2-3.6) unstable; urgency=low
+
+ * Non-maintainer upload to fix RC bug
+ * Fix config script so that it acts as non-interactive when called from the
+ postinst script (Closes: #700820)
+
+ -- Margarita Manterola <ma...@debian.org> Thu, 21 Feb 2013 18:34:32 +0000
+
t1lib (5.1.2-3.5) unstable; urgency=high
* Non-maintainer upload by the Security Team.
diff -u t1lib-5.1.2/debian/t1libconfig t1lib-5.1.2/debian/t1libconfig
--- t1lib-5.1.2/debian/t1libconfig
+++ t1lib-5.1.2/debian/t1libconfig
@@ -27,7 +27,7 @@
fi
echo "sage: `basename $0` [ -v, --version ] [ -h, --help ] [ --force ]"
- echo " [ fontdirs... ]"
+ echo " [ --non-interactive ] [ fontdirs... ]"
if [ "$1" = -h ]
then
@@ -36,6 +36,7 @@
Options: -v, --verbose print version information and exit
-h, --help print this help and exit
--force force configuration
+ --non-interactive do not prompt
EOF
exit 0
else
@@ -57,6 +58,7 @@
temp=/etc/t1lib/FontDatabase.tmp
force=0
+noninteractive=0
while [ $# -ne 0 ]
do
@@ -72,6 +74,9 @@
--force)
force=1
;;
+ --non-interactive)
+ noninteractive=1
+ ;;
*)
# hairy way to remove a trailing backslash (should use perl)
pat=`expr $1 : "\(.*\)\/\$" || echo $1`
@@ -127,10 +132,14 @@
/usr/sbin/t1libconfig with the names of your local font directories as
arguments, or you should edit the /etc/t1lib/FontDatabase file manually.
See the FontDatabase(5) manual page for more information.
+EOF
+ if [ $noninteractive -eq 0 ]; then
+ cat <<EOF
Press [return] to continue.
EOF
read foo || true
+ fi
rm -f $temp
else
echo "done."
diff -u t1lib-5.1.2/debian/t1lib-bin.postinst t1lib-5.1.2/debian/t1lib-bin.postinst
--- t1lib-5.1.2/debian/t1lib-bin.postinst
+++ t1lib-5.1.2/debian/t1lib-bin.postinst
@@ -2,7 +2,7 @@
set -e
if [ ! -f /etc/t1lib/t1lib.config ]; then
- /usr/sbin/t1libconfig
+ /usr/sbin/t1libconfig --non-interactive
fi
#DEBHELPER#
diff -u t1lib-5.1.2/debian/man/t1libconfig.8 t1lib-5.1.2/debian/man/t1libconfig.8
--- t1lib-5.1.2/debian/man/t1libconfig.8
+++ t1lib-5.1.2/debian/man/t1libconfig.8
@@ -12,6 +12,9 @@
]
.B \-\-force
]
+]
+.B \-\-non\-interactive
+]
[
.B fontdirectory...
]
@@ -41,6 +44,9 @@
.B \-\-force
Force the generation of new configuration files even if these files
already exist on the system.
+.TP
+.B \-\-non-interactive
+Don't prompt the user if a problem is encountered.
.SH FILES
.TP 25
.B /etc/t1lib/t1lib.config
