From 8a093f969dafcb915a7df4bcc857e29ded9c6b1c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 7 Feb 2017 09:10:42 +0100 Subject: [PATCH] Bug 18069: Remove residue of rebuild_zebra -x Content-Type: text/plain; charset="utf-8" Bug 17731 removed the -x option of rebuild_zebra but koha-rebuild-zebra still cals the script with this option. "Warning: You passed -x which is already the default and is now deprecated" Test plan: sudo koha-rebuild-zebra -f should no longer raise the warning Signed-off-by: Mason James --- debian/scripts/koha-rebuild-zebra | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/debian/scripts/koha-rebuild-zebra b/debian/scripts/koha-rebuild-zebra index 0eb68d0..b17efe3 100755 --- a/debian/scripts/koha-rebuild-zebra +++ b/debian/scripts/koha-rebuild-zebra @@ -78,8 +78,6 @@ is to do an incremental rebuild. Usage: $scriptname [options] instancename1 instancename2... Options: - --usmarc|-u Runs the process as USMARC rather than - the default of MARCXML. --authorities|-a Only run process for authorities. --biblios|-b Only run process for biblios. --full|-f Does a reindex of the whole collection. @@ -95,7 +93,6 @@ EOF # Default parameters opt_idx="-z" -opt_xml="-x" opt_verbose="" opts_other="" biblios_only="no" @@ -121,9 +118,6 @@ while [ -n "$*" ]; do -a|--authorities) toggle_authorities_only ;; - -u|--usmarc) - opt_xml="" - ;; -f|--full) full_reindex="yes" opt_idx="-r" @@ -164,7 +158,7 @@ do if is_instance $name; then if [ "$biblios" = "yes" ]; then if ! run_rebuild_zebra $name \ - -b $opt_verbose $opt_idx $opt_xml $opts_other; then + -b $opt_verbose $opt_idx $opts_other; then warn "Something went wrong rebuilding biblio indexes for $name" fi fi -- 2.1.4