Merge lp:~roadmr/checkbox/revert-graphics-card-resource-space-eater into lp:checkbox

[Daniel Manrique]

Reverts the previously-merged graphics_card_resource product name hack, as it was deemed inadequate post-merge.

Reverts the previously-merged graphics_card_resource hack, as it was deemed inadequate post-merge.

[Daniel Manrique (roadmr)]

Self-approved.

review: Approve

=== modified file 'providers/plainbox-provider-resource-generic/bin/graphics_card_resource'
--- providers/plainbox-provider-resource-generic/bin/graphics_card_resource	2015-02-25 22:39:28 +0000
+++ providers/plainbox-provider-resource-generic/bin/graphics_card_resource	2015-02-26 18:47:02 +0000
@@ -18,7 +18,6 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
-import re
 import subprocess
 import shlex
 
@@ -116,12 +115,6 @@
                 except ValueError:
                     fake_product = "PCI ID unknown"
                 record['product'] = fake_product
-            # replace characters that would make for an invalid job id
-            record['product'] = re.sub(r"[^_a-zA-Z0-9-]",
-                                       "",
-                                       record['product'].replace(
-                                           " ",
-                                           "_"))
             # Finally, print the record
             items = ["{key}: {value}".format(key=k, value=record[k])
                      for k in sorted(record.keys())]