Merge changes from CUPS 1.6svn-r10510.

[thirdparty/cups.git] / berkeley / lpr.c

diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index 27d73c55ceca86f9f16ef4b9318164cb395e10ca..7d30cc6e6d5cd6f4b12d39ddd77f51e0ff074dfd 100644 (file)
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -89,7 +89,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
               cupsSetUser(argv[i]);
            }
            break;
-           
+
         case 'H' : /* Connect to host */
            if (argv[i][2] != '\0')
               cupsSetServer(argv[i] + 2);
@@ -401,8 +401,9 @@ main(int  argc,                             /* I - Number of command-line arguments */
 
     if (cupsFinishDocument(CUPS_HTTP_DEFAULT, printer) != IPP_OK)
     {
+      _cupsLangPrintf(stderr, "%s: %s", argv[0], cupsLastErrorString());
       cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
-      job_id = 0;
+      return (1);
     }
   }