cups/dests.c: cupsGetNamedDest() - set IPP_STATUS_ERROR_NOT_FOUND error if queue...

lp.c/lpr.c: check for IPP_STATUS_ERROR_NOT_FOUND and generate a proper message if hit

diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index 627fa6a4ea25f3ad85acb75256866ca633b343a5..a8f78b8815b22535566397a80b9432210d7c1495 100644 (file)
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -234,6 +234,12 @@ main(int  argc,                            /* I - Number of command-line arguments */
                _cupsLangPrintf(stderr, _("%s: Error - add '/version=1.1' to server name."), argv[0]);
                return (1);
              }
+             else if (cupsLastError() == IPP_STATUS_ERROR_NOT_FOUND)
+             {
+               _cupsLangPrintf(stderr,
+                               _("%s: Error - The printer or class does not exist."), argv[0]);
+               return (1);
+             }
              break;
 
          case '#' : /* Number of copies */

diff --git a/cups/dest.c b/cups/dest.c
index cde987a0951f2f9a27e8d2e973aca34ee6f903fd..2017792a74df77ed578cf4bfdede62c3c946fa8c 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1839,7 +1839,10 @@ cupsGetNamedDest(http_t     *http,       /* I - Connection to server or @code CUPS_HTT
       cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_name_cb, &data);
 
       if (!data.dest)
+      {
+        _cupsSetError(IPP_STATUS_ERROR_NOT_FOUND, _("The printer or class does not exist."), 1);
         return (NULL);
+      }
 
       dest = data.dest;
     }

diff --git a/systemv/lp.c b/systemv/lp.c
index 298c158257ea90f100b5e345a64f705fcc3b7885..d918b4b14e20ade67cf6866feda28bb9d7bef3ea 100644 (file)
--- a/systemv/lp.c
+++ b/systemv/lp.c
@@ -161,6 +161,12 @@ main(int  argc,                            /* I - Number of command-line arguments */
                                  "name."), argv[0]);
                return (1);
              }
+             else if (cupsLastError() == IPP_STATUS_ERROR_NOT_FOUND)
+             {
+               _cupsLangPrintf(stderr,
+                               _("%s: Error - The printer or class does not exist."), argv[0]);
+               return (1);
+             }
              break;
 
          case 'f' : /* Form */