Merge lp:~bryanquigley/whoopsie/whoopsie-fix into lp:whoopsie

[Bryan Quigley]

[Bryan Quigley (bryanquigley)]

Sorry for the noise, this should be the good one.

[Brian Murray (brian-murray)]

I think it would be good to have a test that ensures that if identifier is this non-unique one we fall back to using the MAC address. There are existing tests in src/test/test_identifier.c. Additionally, the postinst file in the package could be modified to remove whoopsie-id file and generate a new one.

[Bryan Quigley (bryanquigley)]

Thanks for reviewing Brian.

AFAICT the test_identifier test is disabled.
Per postinst change - I'm not sure I wanted to reset existing UUIDs.. You think it's worthwhile?

Unmerged revisions

684. By Bryan Quigley on 2016-10-27

Set to ignore the clearly not unique system-uuid of
00020003-0004-0005-0006-000700080009. Will instead likely
use MAC address. This will not reset existing systems, just
going forward. On those machines you can delete the whoopsie-id
file and then it will regenerate. (LP: #1636954)

=== modified file 'src/identifier.c'
--- src/identifier.c	2014-09-17 19:50:03 +0000
+++ src/identifier.c	2016-10-27 15:52:26 +0000
@@ -297,7 +297,13 @@
 
     whoopsie_identifier_get_system_uuid (&identifier, error);
     if ((!error || !(*error)) && identifier)
-        goto out;
+    {
+	//Filter out non-unique UUID (bad bios)
+	if(strcmp(identifier, "00020003-0004-0005-0006-000700080009") == 0)
+		identifier = NULL;
+	else
+        	goto out;
+    }
 
     if (error && *error) {
         g_error_free (*error);