Fix #7222 About 'yes' parameter for 'label barcodes' command

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 1ae44956d1fb23360c5998ea2d3f68d3ba38d2d0..28a3b5d9999fe76b1cc276348ab0a886826bcad1 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -129,7 +129,7 @@ static struct cmdstruct commands[] = {                                      /* C
        "\n\tsetbandwidth setdebug setip show sqlquery time trace unmount\n\tumount update use var version wait"
        "\n\tsnapshot cloud " DEDUP_KW),         false},
 
- { NT_("label"),      label_cmd,     _("Label a tape"), NT_("storage=<storage> volume=<vol> pool=<pool> slot=<slot> drive=<nb> barcodes"), false},
+ { NT_("label"),      label_cmd,     _("Label a tape"), NT_("storage=<storage> volume=<vol> pool=<pool> slot=<slot> drive=<nb> barcodes [yes]"), false},
  { NT_("list"),       list_cmd,      _("List objects from catalog"),
    NT_("jobs [client=<cli>] [jobid=<nn>] [ujobid=<name>] [job=<name>] [tag=<name>] [joberrors] [jobstatus=<s>] [level=<l>] [jobtype=<t>] [limit=<n>] [order=<asc|desc>]|\n"
        "\tjobtotals | pools | volume | media <pool=pool-name> | files [type=<deleted|all>] jobid=<nn> | copies jobid=<nn> |\n"

diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c
index c464d6e3872ee98ad73365ac66e5195c1a8bad18..5c146dbbf1ff0dcd6b050621eb0cb6106f46f4fe 100644 (file)
--- a/bacula/src/dird/ua_label.c
+++ b/bacula/src/dird/ua_label.c
@@ -544,10 +544,12 @@ static void label_from_barcodes(UAContext *ua, int drive)
       }
       ua->send_msg("%4d  %s\n", vl->Slot, vl->VolName);
    }
-   if (!get_yesno(ua, _("Do you want to label these Volumes? (yes|no): ")) ||
-       (ua->pint32_val == 0)) {
-      goto bail_out;
-   }
+   if ((find_arg(ua, "yes") < 0) &&
+      (!get_yesno(ua, _("Do you want to label these Volumes? (yes|no): ")) ||
+       (ua->pint32_val == 0))) {
+          goto bail_out;
+       }
+
    /* Select a pool */
    bmemset(&pr, 0, sizeof(pr));
    if (!select_pool_dbr(ua, &pr)) {