error when trying to add description to db

[coffbr01]

Package: linux-restricted-modules-generic failed to add to DB
recommends: on<-----6w=-4etksjrt809guw496
insert into package (recommends, maintainer, description, package, replaces, priority, suggests, depends, version, provides, conflicts, automaticallyInstalled, uncompressed_size) values ("on", "Ubuntu Core Developers <email address hidden>", "Common UNIX Printing System(tm) - common files
 The Common UNIX Printing System (or CUPS(tm)) is a printing system and general
 replacement for lpd and the like. It supports the Internet Printing Protocol
 (IPP), and has its own filtering driver model for handling various document
 types.

 This package provides common files for CUPS server and client packages.

 The terms "Common UNIX Printing System" and "CUPS" are trademarks of Easy
 Software Products (www.easysw.com), and refer to the original source packages
 from which these packages are made.
", "cupsys-common", "upsys (< 1.2.3", "optional", "on", "", "1.3.7-1ubuntu3", "None", "cupsys (< 1.2.3)", "yes", "5353k");

Traceback (most recent call last):
  File "/home/students/coffbr01/devel/backend/main.py", line 30, in <module>
    main()
  File "/home/students/coffbr01/devel/backend/main.py", line 6, in main
    updateList = serv.getAvailableUpdates()
  File "/home/students/coffbr01/devel/backend/UbuntuUpdate.py", line 38, in getAvailableUpdates
    dbResult = self.dbConn.addPackage(package,self.machID)
  File "/home/students/coffbr01/devel/database/uusDBConnector.py", line 37, in addPackage
    result = self.helper.addPackage(package)
  File "/home/students/coffbr01/devel/database/uusDBHelper.py", line 397, in addPackage
    self.cursor.execute("insert into package %s values %s"%(columns, values))
  File "/var/lib/python-support/python2.5/MySQLdb/cursors.py", line 166, in execute
    self.errorhandler(self, exc, value)
  File "/var/lib/python-support/python2.5/MySQLdb/connections.py", line 35, in defaulterrorhandler
    raise errorclass, errorvalue
ProgrammingError: (1064, 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'Common UNIX Printing System" and "CUPS" are trademarks of Easy\n Software Product\' at line 1')

[coffbr01 (coffbr01)]

yoyo! fix it :)

[Cameron Webb (cameron-webb)]

Was an issue with incorrectly merged code. The stuff I wrote prior ended up commented out, and so we ended up using the code from before original fix as made.