Attachment 5100 Details for Bug 6540 – Bug 6540 - Followup - koha-create would die without --configfile

[patch] Bug 6540 - Followup - koha-create would die without --configfile

Bug-6540---Followup---koha-create-would-die-withou.patch (text/plain), 1.24 KB, created by Robin Sheat on 2011-08-23 03:46:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robin Sheat

Created: 2011-08-23 03:46:25 UTC

Size: 1.24 KB

patch

obsolete

>From 74013674674d853b7518e30e6ef1afc1a902cc5c Mon Sep 17 00:00:00 2001
>From: Magnus Enger <magnus@enger.priv.no>
>Date: Mon, 15 Aug 2011 09:00:07 +0200
>Subject: [PATCH] Bug 6540 - Followup - koha-create would die without --configfile
>
>koha-create would fail to check that --configfile was set on the
>commandline, before either including it if it existed or dying if
>it did not. This patch should make sure the existence of a
>configfile is only tested if --config is set.
>
>Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
>
>This should apply against 3.4 and master.
>---
> debian/scripts/koha-create |   11 +++++++----
> 1 files changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
>index 2f17d5d..018cae5 100755
>--- a/debian/scripts/koha-create
>+++ b/debian/scripts/koha-create
>@@ -112,11 +112,14 @@ while true ; do
> done
> 
> # Load the configfile given on the command line
>-if [ -e "$configfile" ]
>+if [ "$configfile" != "" ]
> then
>-    . "$configfile"
>-else
>-    die "$configfile does not exist.";
>+    if [ -e "$configfile" ]
>+    then
>+        . "$configfile"
>+    else
>+        die "$configfile does not exist.";
>+    fi
> fi
> 
> # Make sure options from the command line get the highest precedence
>-- 
>1.7.4.1

Actions: View | Diff | Splinter Review

Attachments on bug 6540: 4649 | 4660 | 4677 | 4679 | 4690 | 4691 | 4692 | 4693 | 4694 | 4696 | 5016 | 5100