From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 14 Dec 2011 19:16:28 +0000 (+0100)
Subject: Fix bug #3322 don't poll when operator is labeling tapes
X-Git-Tag: Release-7.0.0~402
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ee97fe7ca0253a0ad08f46420516a58fd12cf028;p=bacula%2Fbacula

Fix bug #3322 don't poll when operator is labeling tapes
---

diff --git a/bacula/src/stored/wait.c b/bacula/src/stored/wait.c
index 6b4e9eb891..0a7a3d1bf1 100644
--- a/bacula/src/stored/wait.c
+++ b/bacula/src/stored/wait.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -33,7 +33,6 @@
  *
  *   Kern Sibbald, March 2005
  *
- *   Version $Id$
  */
 
 
@@ -136,6 +135,13 @@ int wait_for_sysop(DCR *dcr)
          break;
       }
 
+      /*
+       * Continue waiting if operator is labeling volumes 
+       */
+      if (dev->blocked() == BST_WRITING_LABEL) {
+         continue;
+      }
+
       if (dev->rem_wait_sec <= 0) {  /* on exceeding wait time return */
          Dmsg0(dbglvl, "Exceed wait time.\n");
          stat = W_TIMEOUT;