Bugzilla – Attachment 17826 Details for
Bug 10150
koha-email-disable error handling
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Signed off patch
0001-Bug-10150-koha-email-disable-error-handling.patch (text/plain), 3.39 KB, created by
Chris Cormack
on 2013-04-29 23:49:11 UTC
(
hide
)
Description:
Signed off patch
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2013-04-29 23:49:11 UTC
Size:
3.39 KB
patch
obsolete
>From 2cd7007a1bfb8decb6b1f50037e6e3784cfa90bb Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Mon, 29 Apr 2013 12:29:40 -0300 >Subject: [PATCH] Bug 10150 - koha-email-disable error handling >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >koha-email-disable now >- Checks the instance exists. >- Checks if email is already disabled. > >Regards >To+ > >Sponsored-by: Universidad Nacional de Córdoba >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >--- > debian/docs/koha-email-disable.xml | 4 +- > debian/scripts/koha-email-disable | 81 ++++++++++++++++++++++++++++++------ > 2 files changed, 71 insertions(+), 14 deletions(-) > >diff --git a/debian/docs/koha-email-disable.xml b/debian/docs/koha-email-disable.xml >index 81834f2..d901123 100644 >--- a/debian/docs/koha-email-disable.xml >+++ b/debian/docs/koha-email-disable.xml >@@ -17,7 +17,7 @@ > > <refnamediv> > <refname>koha-email-disable</refname> >- <refpurpose>Turn off the email for a Koha instance.</refpurpose> >+ <refpurpose>Turn off the email for Koha instances.</refpurpose> > <refclass>UNIX/Linux</refclass> > </refnamediv> > >@@ -28,7 +28,7 @@ > </refsynopsisdiv> > > <refsect1><title>Description</title> >- <para>Turn off the email for a Koha instance.</para> >+ <para>Turn off the email for Koha instances.</para> > </refsect1> > > <refsect1><title>See also</title> >diff --git a/debian/scripts/koha-email-disable b/debian/scripts/koha-email-disable >index 5d381cb..615f4f4 100755 >--- a/debian/scripts/koha-email-disable >+++ b/debian/scripts/koha-email-disable >@@ -1,6 +1,6 @@ > #!/bin/sh > # >-# koha-email-disable -- turn off the email for a Koha instance >+# koha-email-disable - turn off the email for Koha instances > # Copyright 2010 Catalyst IT, Ltd > # > # This program is free software: you can redistribute it and/or modify >@@ -18,19 +18,76 @@ > > set -e > >-if [ "$#" = 0 ] >-then >- echo "Disables the email for a koha instance." 1>&2 >- echo "Usage: $0 instancename..." 1>&2 >+die() >+{ >+ echo "$@" 1>&2 > exit 1 >-fi >-libdir=/var/lib/koha >+} >+ >+warn() >+{ >+ echo "$@" 1>&2 >+} >+ >+is_instance() >+{ >+ local instancename=$1 >+ >+ if find /etc/koha/sites -mindepth 1 -maxdepth 1 \ >+ -type d -printf '%f\n'\ >+ | grep -q -x $instancename ; then >+ return 0 >+ else >+ return 1 >+ fi >+} >+ >+is_email_enabled() >+{ >+ local instancename=$1 >+ >+ if [ -e /var/lib/koha/$instancename/email.enabled ]; then >+ return 0 >+ else >+ return 1 >+ fi >+} >+ >+disable_email() >+{ >+ local instancename=$1 >+ local libdir="/var/lib/koha" >+ >+ rm -f $libdir/$instancename/email.enabled >+ >+ echo "Disabled email for instance $instancename." >+} >+ >+usage() >+{ >+ local scriptname=$0 >+ cat <<EOF >+Disables the email for Koha instances. >+ >+Usage: $scriptname instancename1 instancename2... >+ >+EOF >+} >+ >+# Parse command line. >+[ $# -ge 1 ] || ( usage ; die "Missing instance name..." ) >+ > for name in "$@" > do >- if [ ! -d $libdir/$name ] >- then >- echo "$0: no koha instance \"$name\"" 1>&2 >- continue >+ if is_instance $name; then >+ if is_email_enabled $name; then >+ disable_email $name >+ else >+ warn "Email already disabled for instance $name." >+ fi >+ else >+ warn "Unknown instance $name." > fi >- rm -f $libdir/$name/email.enabled > done >+ >+exit 0 >-- >1.7.10.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10150
:
17800
|
17826
|
17877