Make the Keystone tag contain -32bit and -full as needed

build/mac/tweak_info_plist.py

Index: build/mac/tweak_info_plist.py
diff --git a/build/mac/tweak_info_plist.py b/build/mac/tweak_info_plist.py
index eb38acea4e27ff669b6e56492632e8b3744324e6..1abaaa1d741066bf54e22c46bc3362b8a6a60a55 100755
--- a/build/mac/tweak_info_plist.py
+++ b/build/mac/tweak_info_plist.py
@@ -204,6 +204,23 @@ def _RemoveBreakpadKeys(plist):
       'BreakpadSkipConfirm')
 
 
+def _TagSuffixes():
+  # Keep this list sorted in the order that tag suffix components are to
+  # appear in a tag value. That is to say, it should be sorted per ASCII.
+  components = ('32bit', 'full')

[Nico, 2014/01/02 23:56:28]

assert sorted(components) == components

[Mark Mentovai, 2014/01/03 16:46:41]

Nico wrote:
sorted returns a list and components is a tuple, but I can work that in…

+
+  components_len = len(components)
+  combinations = 1 << components_len
+  tag_suffixes = []
+  for combination in xrange(0, combinations):

[Nico, 2014/01/02 23:56:28]

start this at 1…

[Mark Mentovai, 2014/01/03 16:46:41]

Nico wrote:
But I want it to return '' in the list. _AddKeystoneKeys doesn’t want it, but
_RemoveKeystoneKeys does.

+    tag_suffix = ''
+    for component_index in xrange(0, components_len):
+      if combination & 1 << component_index:

[TVL, 2014/01/03 00:09:40]

do you want parens in here to be safe?

+        tag_suffix += '-' + components[component_index]
+    tag_suffixes.append(tag_suffix)
+  return tag_suffixes
+
+
 def _AddKeystoneKeys(plist, bundle_identifier):
   """Adds the Keystone keys. This must be called AFTER _AddVersionKeys() and
   also requires the |bundle_identifier| argument (com.example.product)."""
@@ -211,6 +228,11 @@ def _AddKeystoneKeys(plist, bundle_identifier):
   plist['KSProductID'] = bundle_identifier
   plist['KSUpdateURL'] = 'https://tools.google.com/service/update2'
 
+  _RemoveKeys(plist, 'KSChannelID')
+  for tag_suffix in _TagSuffixes():
+    if tag_suffix:

[Nico, 2014/01/02 23:56:28]

…and remove this if


Also, this always adds all keys. Is that intended?

[Mark Mentovai, 2014/01/03 16:46:41]

Nico wrote:
Yes. All of the keys need to be in the Info.plist so that there’s something for
the Keystone ticket’s tag-key to point to.

The reason Keystone has tag-path and tag-key is so that the tag that Keystone
sees is actually the tag (channel) of the Chrome installation on disk. Before we
added this, the Keystone ticket just had the tag stored directly in it, which
made it difficult for users to move between channels. Now, since Keystone picks
up the tag value from Chrome’s Info.plist itself, Keystone always knows what
channel Chrome is on, even if the user replaces it with a Chrome of a different
channel.

That’s why we need all of the possible combinations of tags in Chrome’s
Info.plist. A beta-channel Chrome will always need to identify itself as “beta”,
but now it might be “beta” alone, “beta-32bit”, “beta-32bit-full”, or
“beta-full”. All of those strings need to be baked into its Info.plist so that
the tag-key has something to point to that contains the correct value.

+      plist['KSChannelID' + tag_suffix] = tag_suffix
+
 
 def _RemoveKeystoneKeys(plist):
   """Removes any set Keystone keys."""
@@ -219,6 +241,11 @@ def _RemoveKeystoneKeys(plist):
       'KSProductID',
       'KSUpdateURL')
 
+  tag_keys = []
+  for tag_suffix in _TagSuffixes():
+    tag_keys.append('KSChannelID' + tag_suffix)
+  _RemoveKeys(plist, *tag_keys)
+
 
 def Main(argv):
   parser = optparse.OptionParser('%prog [options]')