Attachment 9366 Details for Bug 7924 – Bug 7924 - Fix handling of command line arguments in koha-remove

[patch] Bug 7924 - Fix handling of command line arguments in koha-remove

Bug-7924---Fix-handling-of-command-line-arguments-.patch (text/plain), 1.51 KB, created by Magnus Enger on 2012-04-30 11:54:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Magnus Enger

Created: 2012-04-30 11:54:05 UTC

Size: 1.51 KB

patch

obsolete

>From 7741862f0b8750c7426965656a996223d26677c1 Mon Sep 17 00:00:00 2001
>From: Magnus Enger <magnus@enger.priv.no>
>Date: Mon, 30 Apr 2012 13:49:38 +0200
>Subject: [PATCH] Bug 7924 - Fix handling of command line arguments in koha-remove
>Content-Type: text/plain; charset="utf-8"
>
>koha-remove would fail with a message like this:
>Removing Koha instance --
>ERROR 1396 (HY000) at line 1: Operation DROP USER failed for 'koha_--'@'%'
>
>After fixing this, the --keep-mysql option made the script exit without doing
>anything.
>
>To test:
>
>Alt 1
>- Build package with build-git-snapshot
>- Install package
>
>Alt 2
>- Replicate the changes in the patch in an existing installation
>
>Then:
>- Add instance1 and instance2
>- koha-remove instance1
>-- Check that script completes and the databse is gone
>- koha-remove --keep-mysql instance2
>-- Check that the script completes but the database is not removed
>---
> debian/scripts/koha-remove |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
>index 09720ea..567ead8 100755
>--- a/debian/scripts/koha-remove
>+++ b/debian/scripts/koha-remove
>@@ -20,17 +20,17 @@
> set -e
> 
> args=$(getopt -l keep-mysql -o k -n $0 -- "$@")
>-set -- $args
>+eval set -- $args
> while [ ! -z "$1" ]
> do
>     case "$1" in
>-         -k|--keep-mysql) keepmysql=1; exit;;
>+         -k|--keep-mysql) keepmysql=1; shift;;
>+         --) shift; break;;
>           *) break;;
>     esac
>     shift
> done
> 
>-
> for name in "$@"
> do
>     echo "Removing Koha instance $name"
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 7924: 9030 | 9366 | 9456