From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 23 May 2009 15:16:25 +0000 (+0000)
Subject: Rework printed message when files are purged on restore
X-Git-Tag: Release-3.0.2~210
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=38347ffd92c87e1e9e2d8e6503ef721970f8e2b1;p=bacula%2Fbacula

Rework printed message when files are purged on restore

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

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index 797a6e6e8c..90a475c6b2 100644
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -993,8 +993,9 @@ static bool ask_for_fileregex(UAContext *ua, RESTORE_CTX *rx)
    if (find_arg(ua, NT_("all")) >= 0) {  /* if user enters all on command line */
       return true;                       /* select everything */
    }
-   ua->send_msg(_("\n\nThere were no files inserted into the tree, so file selection\n"
-                  "is not possible. Most likely your retention policy pruned the files\n"));
+   ua->send_msg(_("\n\nFor one or more of the JobIds selected, no files were found,\n"
+                 "so file selection is not possible.\n"
+                 "Most likely your retention policy pruned the files.\n"));
    if (get_yesno(ua, _("\nDo you want to restore all the files? (yes|no): "))) {
       if (ua->pint32_val == 1)
          return true;
@@ -1008,8 +1009,9 @@ static bool ask_for_fileregex(UAContext *ua, RESTORE_CTX *rx)
 
             fileregex_re = (regex_t *)bmalloc(sizeof(regex_t));
             rc = regcomp(fileregex_re, ua->cmd, REG_EXTENDED|REG_NOSUB);
-            if (rc != 0)
+            if (rc != 0) {
                regerror(rc, fileregex_re, errmsg, sizeof(errmsg));
+            }
             regfree(fileregex_re);
             free(fileregex_re);
             if (*errmsg) {