From 4987b30a5db98b006447f7c6ce2d03c0a5da7d8c Mon Sep 17 00:00:00 2001 From: Jean Milanez Melo Date: Fri, 12 May 2006 18:28:39 +0000 Subject: [PATCH] - Add conditional in pkg-install/pkg-deinstall to check if the allow file in cron dir already exists. Reported by: Steve Ames via email Approved by: mnag (mentor) --- mail/mailman/pkg-deinstall | 6 ++++-- mail/mailman/pkg-install | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mail/mailman/pkg-deinstall b/mail/mailman/pkg-deinstall index 93c125e19a01..05972ee6ebc5 100644 --- a/mail/mailman/pkg-deinstall +++ b/mail/mailman/pkg-deinstall @@ -13,8 +13,10 @@ DEINSTALL) /usr/bin/diff - %%MAILMANDIR%%/cron/crontab.in >/dev/null 2>&1 ; then echo "---> Zeroing crontab for \"%%USER%%\"" /usr/bin/crontab -u "%%USER%%" /dev/null - grep -v %%USER%% /var/cron/allow > /var/cron/allow.new - mv /var/cron/allow.new /var/cron/allow + if [ -e /var/cron/allow ]; then + grep -v %%USER%% /var/cron/allow > /var/cron/allow.new + mv /var/cron/allow.new /var/cron/allow + fi else echo "---> Crontab for \"%%USER%%\" not removed: please deinstall" echo "---> manually if you no-longer wish to use Mailman. eg:" diff --git a/mail/mailman/pkg-install b/mail/mailman/pkg-install index 72dcae989707..2441fa532116 100644 --- a/mail/mailman/pkg-install +++ b/mail/mailman/pkg-install @@ -51,7 +51,9 @@ POST-INSTALL) echo "---> Checking crontab(5) file for user \"%%USER%%\"" + if [ -e /var/cron/allow ]; then echo "%%USER%%" >> /var/cron/allow + fi if /usr/bin/crontab -u "%%USER%%" -l >/tmp/mmctab$$ 2>&1 ; then if test -s /tmp/mmctab$$; then