From 429656ed252e596f8c4e32216a7314f6172c4e48 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 15 May 2018 13:57:54 +0200
Subject: bin/db-update,bin/delete-packages,bin/get-package-updates -b|--block
 -> -w|--wait to unitise flags

---
 bin/db-update           | 14 +++++++-------
 bin/delete-packages     | 12 ++++++------
 bin/get-package-updates | 12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bin/db-update b/bin/db-update
index a2555fe..b6fd116 100755
--- a/bin/db-update
+++ b/bin/db-update
@@ -30,8 +30,6 @@ usage() {
   >&2 echo ' move possible packages from staging to testing.'
   >&2 echo ''
   >&2 echo 'possible options:'
-  >&2 echo '  -b|--block:'
-  >&2 echo '    If necessary, wait for lock blocking.'
   >&2 echo '  -f|--force $package-id:'
   >&2 echo '    Force movement of Package with given id and move nothing else.'
   >&2 echo '  -h|--help:'
@@ -42,16 +40,18 @@ usage() {
   >&2 echo '    Move forward any package which replaces no package whose'
   >&2 echo '    dependencies are all available somewhere.'
   >&2 echo '    Note, that this _may_ move _less_ packages.'
+  >&2 echo '  -w|--wait:'
+  >&2 echo '    If necessary, wait for lock blocking.'
   [ -z "$1" ] && exit 1 || exit "$1"
 }
 
 eval set -- "$(
-  getopt -o bf:hnp \
-    --long block \
+  getopt -o f:hnpw \
     --long force \
     --long help \
     --long no-action \
     --long progressive \
+    --long wait \
     -n "$(basename "$0")" -- "$@" || \
   echo usage
 )"
@@ -64,9 +64,6 @@ force_ids=''
 while true
 do
   case "$1" in
-    -b|--block)
-      block_flag=''
-    ;;
     -f|--force)
       shift
       force_ids=$(
@@ -84,6 +81,9 @@ do
     -p|--progressive)
       progressive=true
     ;;
+    -w|--wait)
+      block_flag=''
+    ;;
     --)
       shift
       break
diff --git a/bin/delete-packages b/bin/delete-packages
index 0279be8..520b664 100755
--- a/bin/delete-packages
+++ b/bin/delete-packages
@@ -25,17 +25,17 @@ usage() {
   >&2 echo ' delete obsolete binary packages.'
   >&2 echo ''
   >&2 echo 'possible options:'
-  >&2 echo '  -b|--block:       If necessary, wait for lock blocking.'
   >&2 echo '  -h|--help:        Show this help and exit.'
   >&2 echo '  -n|--no-action:   Only print what would be deleted.'
+  >&2 echo '  -w|--wait:        If necessary, wait for lock blocking.'
   [ -z "$1" ] && exit 1 || exit "$1"
 }
 
 eval set -- "$(
-  getopt -o bhn \
-    --long block \
+  getopt -o hnw \
     --long help \
     --long no-action \
+    --long wait \
     -n "$(basename "$0")" -- "$@" || \
   echo usage
 )"
@@ -46,15 +46,15 @@ no_action=false
 while true
 do
   case "$1" in
-    -b|--block)
-      block_flag=''
-    ;;
     -h|--help)
       usage 0
     ;;
     -n|--no-action)
       no_action=true
     ;;
+    -w|--wait)
+      block_flag=''
+    ;;
     --)
       shift
       break
diff --git a/bin/get-package-updates b/bin/get-package-updates
index 8931a3a..91bdde3 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -23,13 +23,13 @@ usage() {
   >&2 echo ' and build a list in the proper build order'
   >&2 echo ''
   >&2 echo 'possible options:'
-  >&2 echo '  -b|--block:   If necessary, wait for lock blocking.'
   >&2 echo '  -d|--date $datetime:'
   >&2 echo '                Pull latest commit before $datetime'
   >&2 echo '                (yyyy-mm-ddThh:mm:ss). Conflicts -n.'
   >&2 echo '  -h|--help:    Show this help and exit.'
   >&2 echo '  -n|--no-pull: Do not pull git repos, merely reorder build list.'
   >&2 echo '                Conflicts -d.'
+  >&2 echo '  -w|--wait:    If necessary, wait for lock blocking.'
   >&2 echo '  -x|--test-exclusion $package:'
   >&2 echo '                Print additionally deleted/excluded packages if'
   >&2 echo '                "$package" would be black listed.'
@@ -37,12 +37,12 @@ usage() {
 }
 
 eval set -- "$(
-  getopt -o bd:hnx: \
-    --long block \
+  getopt -o d:hnwx: \
     --long date: \
     --long help \
     --long no-pull \
     --long test-exclusion: \
+    --long wait \
     -n "$(basename "$0")" -- "$@" || \
   echo usage
 )"
@@ -55,9 +55,6 @@ pull=true
 while true
 do
   case "$1" in
-    -b|--block)
-      block_flag=''
-    ;;
     -d|--date)
       shift
       date_time="$1"
@@ -68,6 +65,9 @@ do
     -n|--no-pull)
       pull=false
     ;;
+    -w|--wait)
+      block_flag=''
+    ;;
     -x|--test-exclusion)
       shift
       if [ -n "${test_exclusion}" ]; then
-- 
cgit v1.2.3-70-g09d2