rpms/hplip/devel hplip-strcasecmp.patch, 1.1, 1.2 hplip.spec, 1.65, 1.66
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 18 15:48:53 UTC 2006
- Previous message (by thread): rpms/hplip/FC-5 hplip-strcasecmp.patch, 1.1, 1.2 hplip.spec, 1.60, 1.61
- Next message (by thread): rpms/hplip/devel hplip-0.9.10-1.patch, NONE, 1.1 hplip-strcasecmp.patch, 1.2, 1.3 hplip.spec, 1.66, 1.67
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29942
Modified Files:
hplip-strcasecmp.patch hplip.spec
Log Message:
* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com>
- Fixed another case-sensitive match.
hplip-strcasecmp.patch:
device.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: hplip-strcasecmp.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-strcasecmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-strcasecmp.patch 4 Apr 2006 10:45:59 -0000 1.1
+++ hplip-strcasecmp.patch 18 Apr 2006 15:48:48 -0000 1.2
@@ -1,5 +1,5 @@
---- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp 2006-04-04 11:00:24.000000000 +0100
-+++ hplip-0.9.10/io/hpiod/device.cpp 2006-04-04 11:00:40.000000000 +0100
+--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp 2006-03-03 00:07:26.000000000 +0000
++++ hplip-0.9.10/io/hpiod/device.cpp 2006-04-18 15:44:14.000000000 +0100
@@ -633,7 +633,7 @@
pSys->GeneralizeModel(sz, gen, sizeof(gen));
@@ -9,3 +9,12 @@
goto bugout;
if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)
+@@ -913,7 +913,7 @@
+ /* Make sure uri model still matches device id model. */
+ pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
+ pSys->GetModel(ID, model, sizeof(model));
+- if (strcmp(uriModel, model) != 0)
++ if (strcasecmp(uriModel, model) != 0)
+ {
+ *result = R_INVALID_DEVICE_NODE; /* found different device plugged in */
+ syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- hplip.spec 4 Apr 2006 12:02:26 -0000 1.65
+++ hplip.spec 18 Apr 2006 15:48:48 -0000 1.66
@@ -170,6 +170,9 @@
fi
%changelog
+* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed another case-sensitive match.
+
* Tue Apr 4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-4
- Use case-insensitive matching. 0.9.8 gave all-uppercase in some
situations.
- Previous message (by thread): rpms/hplip/FC-5 hplip-strcasecmp.patch, 1.1, 1.2 hplip.spec, 1.60, 1.61
- Next message (by thread): rpms/hplip/devel hplip-0.9.10-1.patch, NONE, 1.1 hplip-strcasecmp.patch, 1.2, 1.3 hplip.spec, 1.66, 1.67
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list