[Lsb-messages] /var/www/bzr/lsb/4.0/printing-test r67: Backport part of the patch for bug 3440 from devel (cupsGetDests2 not enabled)

Stew Benedict stewb at linux-foundation.org
Fri May 11 17:19:30 UTC 2012


------------------------------------------------------------
revno: 67
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: printing-test
timestamp: Fri 2012-05-11 13:19:30 -0400
message:
  Backport part of the patch for bug 3440 from devel (cupsGetDests2 not enabled)
modified:
  sources/printing-test/convenience/cupsConvenience.c
-------------- next part --------------
=== modified file 'sources/printing-test/convenience/cupsConvenience.c'
--- a/sources/printing-test/convenience/cupsConvenience.c	2010-10-18 15:35:43 +0000
+++ b/sources/printing-test/convenience/cupsConvenience.c	2012-05-11 17:19:30 +0000
@@ -453,8 +453,9 @@
     /* see bug 2645 - need to call cupsGetDests first */
     org_dests = cupsGetDests(&dests);
 
-    if((num_dests = cupsAddDest(dname, NULL, 1, &dests)) != org_dests + 1) {
-        tet_printf("cupsAddDest returned %d, expected %d", num_dests, org_dests + 1);
+    /* see bug 3440 - don't always get org_dests + 1 either? Just accept >= 0 # */
+    if((num_dests = cupsAddDest(dname, NULL, 1, &dests)) < 0) {
+        tet_printf("cupsAddDest returned %d, expected >= 0", num_dests);
         tet_result(TET_FAIL);
     } else {
         tet_result(TET_PASS);



More information about the lsb-messages mailing list