Final changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@791 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 9b85652fdd549a98736a9cb5f37f819790dcc055..ab40321fd6f64d6e79a215c14a67f79ac057bca8 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,6 +1,7 @@
 
-2003-10-29 Version 1.32c 29Oct03
+2003-10-30 Version 1.32c 30Oct03 Release
 29Oct03
+- Add %v to job edit codes. It edits in the VolumeName(s).
 - Add code to ensure that fds 0,1, and 2 are defined by dup'ing them
   to /dev/null if necessary.  Mostly for Windows that does not have them.
 - Error check dir_create_jobmedia_record() 2 places in acquire.c

diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c
index b40a5dc09c2c39197b03d8763d323683b4d12262..73e5c6b8e8cf477c5585f52eb71a22473d776506 100644 (file)
--- a/bacula/src/dird/restore.c
+++ b/bacula/src/dird/restore.c
@@ -88,6 +88,7 @@ int do_restore(JCR *jcr)
    /* 
     * The following code is kept temporarily for compatibility.
     * It is the predecessor to the Bootstrap file.
+    *  DEPRECATED
     */
    if (!jcr->RestoreBootstrap) {
       /*

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 69341ecc195a473fd16b19932841a395b0ed1c65..fb2434e6a260d5d6154919bfef059a061aa66d4a 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -481,6 +481,7 @@ void make_session_key(char *key, char *seed, int mode)
  *  %n = Unadorned Job name
  *  %t = Job type (Backup, ...)
  *  %r = Recipients
+ *  %v = Volume name
  *
  *  omsg = edited output message
  *  imsg = input string containing edit codes (%x)
@@ -539,6 +540,13 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, char *to)
          case 't':
            str = job_type_to_str(jcr->JobType);
            break;
+         case 'v':
+           if (jcr->VolumeName && jcr->VolumeName[0]) {
+              str = jcr->VolumeName;
+           } else {
+               str = "";
+           }
+           break;
         default:
             add[0] = '%';
            add[1] = *p;

diff --git a/bacula/src/version.h b/bacula/src/version.h
index c138161f4a93abb3076cd2e0f00abf433dbf336c..3a50b8ae047128e9de023cc0a5736d6c664996d1 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -2,8 +2,8 @@
 #undef  VERSION
 #define VERSION "1.32c"
 #define VSTRING "1"
-#define BDATE   "29 Oct 2003"
-#define LSMDATE "20Oct03"
+#define BDATE   "30 Oct 2003"
+#define LSMDATE "30Oct03"
 
 /* Debug flags */
 #undef  DEBUG