- fix bnc#644467: SuSEconfig.groff overwrites /etc/papersize

use the check_md5_and_move to prevent it
- deprecation warning for  GROFF* variables in /etc/sysconfig/suseconfig

OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=8
This commit is contained in:
Michal Vyskocil 2010-10-07 09:38:15 +00:00 committed by Git OBS Bridge
parent 2c5073b5af
commit 3c9c9b30e0
2 changed files with 17 additions and 1 deletions

View File

@ -25,6 +25,11 @@ test -f /lib/YaST/SuSEconfig.functions || {
}
. /lib/YaST/SuSEconfig.functions
test -n "$UPDATE_GROFF_CONF" -a "$UPDATE_GROFF_CONF" = "no" && {
echo "Warning: UPDATE_GROFF_CONF is deprecated and might be removed in future"
echo "SuSEconfig.groff no longer rewrites user modified /etc/papersize"
}
test -n "$UPDATE_GROFF_CONF" -a "$UPDATE_GROFF_CONF" = "yes" || exit 0
function get_paper () {
@ -43,6 +48,9 @@ PAPER_SIZE=$(get_paper)
# if GROFF_PAGESIZE is set, it overrides the locale information:
if [ -n "$GROFF_PAGESIZE" ] ; then
echo "Warning: GROFF_PAGESIZE is deprecated and might be removed in future"
echo "Use RC_LANG or RC_LC_PAPER in /etc/sysconfig/language"
echo "or write the value to /etc/papersize, it will not be overwritten"
# make GROFF_PAGESIZE lower case only:
GROFF_PAGESIZE=$( echo $GROFF_PAGESIZE | tr '[:upper:]' '[:lower:]' )
case $GROFF_PAGESIZE in
@ -56,6 +64,7 @@ if [ -n "$GROFF_PAGESIZE" ] ; then
esac
fi
echo "$PAPER_SIZE" > /etc/papersize
echo "$PAPER_SIZE" > /etc/papersize.SuSEconfig
check_md5_and_move /etc/papersize
exit 0

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Oct 7 09:33:18 UTC 2010 - mvyskocil@suse.cz
- fix bnc#644467: SuSEconfig.groff overwrites /etc/papersize
use the check_md5_and_move to prevent it
- deprecation warning for GROFF* variables in /etc/sysconfig/suseconfig
-------------------------------------------------------------------
Tue Oct 5 12:25:28 UTC 2010 - mvyskocil@suse.cz