[Merge] ubuntu-release-upgrader:apple-quirk into ubuntu-release-upgrader:ubuntu/hirsute
Brian Murray
brian at ubuntu.com
Wed May 26 01:27:05 UTC 2021
I choose to use /sys/class/dmi/id/sys_vendor because that is what apport does as a part of building "MachineType" in existing bug reports. You can see this generated https://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu/impish/apport/ubuntu/view/head:/apport/hookutils.py#L277 and where dmi comes from https://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu/impish/apport/ubuntu/view/head:/apport/hookutils.py#L210. With that in mind I looked through my local cache of bug report attachments and Descriptions from foundations subscribed packages and found the following:
$ for desc in $(find . -name Description.txt); do grep "MachineType: Apple.*" $desc; done MachineType: Apple Inc. MacBookPro11,1
MachineType: Apple Inc. Macmini5,1
MachineType: Apple Inc. MacBookPro6,2
MachineType: Apple Inc. MacBookPro5,4
MachineType: Apple Inc. MacBookPro8,1
MachineType: Apple Inc. MacBookPro8,1
MachineType: Apple Inc. MacBookPro11,4
MachineType: Apple Inc. MacBookPro7,1
MachineType: Apple Inc. MacBookPro10,1
MachineType: Apple Inc. MacPro5,1
MachineType: Apple Inc. MacBook2,1
MachineType: Apple Inc. MacBookPro9,2
MachineType: Apple Inc. MacBookPro10,1
MachineType: Apple Inc. MacBookPro12,1
MachineType: Apple Inc. MacBookPro11,3
MachineType: Apple Inc. MacBookPro10,1
MachineType: Apple Inc. MacBookPro11,2
MachineType: Apple Inc. MacBookPro12,1
MachineType: Apple Inc. MacBookPro6,2
MachineType: Apple Inc. Macmini5,1
MachineType: Apple Computer, Inc. MacPro2,1
MachineType: Apple Inc. MacBookPro11,4
MachineType: Apple Inc. MacBookPro12,1
MachineType: Apple Inc. MacBookPro9,2
MachineType: Apple Computer, Inc. MacBookPro1,1
MachineType: Apple Inc. iMac10,1
MachineType: Apple Inc. MacBookAir7,2
MachineType: Apple Inc. MacBook2,1
MachineType: Apple Inc. MacBookPro11,4
So I used "startswith('Apple')" because that will match both 'Apple Inc' and 'Apple Computer, Inc'. If you think that should be expanded to something like "'Apple Inc' is in vendor" that's fine but I think matching on the product name is excessive.
--
https://code.launchpad.net/~ubuntu-core-dev/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/403224
Your team Ubuntu Core Development Team is requested to review the proposed merge of ubuntu-release-upgrader:apple-quirk into ubuntu-release-upgrader:ubuntu/hirsute.
More information about the Ubuntu-reviews
mailing list