Tweak output message

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 116845789ddc729d947fea5ea33b24ccc9059a7f..932751bf68e421fb1f74d43e9eaa52bc49c2020a 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -254,7 +254,7 @@ bool send_accurate_current_files(JCR *jcr)
       /* On Full mode, if no previous base job, no accurate things */
       if (get_base_jobids(jcr, &jobids)) {
          jcr->HasBase = true;
-         Jmsg(jcr, M_INFO, 0, _("Using BaseJobId(s): %s\n"), jobids.list);
+         Jmsg(jcr, M_INFO, 0, _("Using Base JobId(s): %s\n"), jobids.list);
       } else if (!jcr->rerunning) {
          return true;
       }

diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index 45fab76525fd339e9c3a83a8094ae9348ba95dd5..49b578dec68e47862580c983cf084e270301ae48 100644 (file)
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -356,9 +356,11 @@ static int do_list_cmd(UAContext *ua, const char *cmd, e_list_type llist)
       } else if (!ua->argv[j]) {
          /* skip */
       } else if (strcasecmp(ua->argk[j], NT_("order")) == 0) {
-         if (strcasecmp(ua->argv[j], NT_("desc")) == 0) {
+         if (strcasecmp(ua->argv[j], NT_("desc")) == 0 ||
+             strcasecmp(ua->argv[j], NT_("descending")) == 0) {
             jr.order = 1;
-         } else if (strcasecmp(ua->argv[j], NT_("asc")) == 0) {
+         } else if (strcasecmp(ua->argv[j], NT_("asc")) == 0 ||
+                    strcasecmp(ua->argv[j], NT_("ascending")) == 0) {
             jr.order = 0;
          } else {
             ua->error_msg(_("Unknown order type %s\n"), ua->argv[j]);

diff --git a/bacula/src/dird/vbackup.c b/bacula/src/dird/vbackup.c
index 224fd65a9fc41c2dc2004f636cc36c8b7823ee96..215233024ba3c41481b8cdb0c700ac4bc78dfe66 100644 (file)
--- a/bacula/src/dird/vbackup.c
+++ b/bacula/src/dird/vbackup.c
@@ -284,6 +284,10 @@ _("This Job is not an Accurate backup so is not equivalent to a Full backup.\n")
    jcr->jr.JobTDate = jcr->start_time;
    jcr->setJobStatus(JS_Running);
 
+   /* Add the following when support for base jobs is added to virtual full */
+   //jcr->HasBase = jcr->job->base != NULL;
+   //jcr->jr.HasBase = jcr->HasBase;
+
    /* Update job start record */
    if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
       Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));

diff --git a/regress/tests/base-job-test b/regress/tests/base-job-test
index 07ef5ba92bea984c8fafb1195d3f81aced78c1a7..abcebac1eed3907a3b247a6df49dfd6b1dda18a6 100755 (executable)
--- a/regress/tests/base-job-test
+++ b/regress/tests/base-job-test
@@ -112,7 +112,7 @@ if [ $? -ne 0 ]; then
     bstat=2
 fi
 
-grep -e 'Using BaseJobId(s): 1$'  ${cwd}/tmp/log4.out > /dev/null
+grep -e 'Using Base JobId(s): 1$'  ${cwd}/tmp/log4.out > /dev/null
 if [ $? -ne 0 ]; then
     print_debug "ERROR: The first full job should use only jobid=1 as basejob"
     bstat=2

diff --git a/regress/tests/virtual-backup-test b/regress/tests/virtual-backup-test
index 8289be98dbff96efebad2483fa64a7ed8ea13d60..7a35d7d8edd2e31657bdf9484058d8d0154457c9 100755 (executable)
--- a/regress/tests/virtual-backup-test
+++ b/regress/tests/virtual-backup-test
@@ -78,7 +78,7 @@ run job=$JobName level=VirtualFull yes
 wait
 messages
 list volumes
-list jobs
+llist jobs
 @# 
 @# now do a restore of the consolidated Full
 @#