summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-02 00:27:07 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-02 00:27:07 +0000
commita0c1d77b74c1f610511ebfda8e155ce0891fbb46 (patch)
tree9025489c99dfed733f9aad0600b8a06201cc8c15 /native_client_sdk
parent0814173c16be5ef56333a087c8c67b3dc68acee5 (diff)
downloadchromium_src-a0c1d77b74c1f610511ebfda8e155ce0891fbb46.zip
chromium_src-a0c1d77b74c1f610511ebfda8e155ce0891fbb46.tar.gz
chromium_src-a0c1d77b74c1f610511ebfda8e155ce0891fbb46.tar.bz2
[NaCl SDK] post_stable bundles should not be recommended.
BUG=179414 R=noelallen@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12385052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py2
-rwxr-xr-xnative_client_sdk/src/build_tools/update_nacl_manifest.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py b/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py
index 73965fe..38b8068 100755
--- a/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py
+++ b/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py
@@ -559,8 +559,10 @@ mac,canary,21.0.1156.0,2012-05-30 12:14:21.305090"""
self._ReadUploadedManifest()
p18_bundle = self.uploaded_manifest.GetBundle(B18_R1_NONE.name)
self.assertEqual(p18_bundle.stability, POST_STABLE)
+ self.assertEqual(p18_bundle.recommended, 'no')
p19_bundle = self.uploaded_manifest.GetBundle(B19_R1_NONE.name)
self.assertEqual(p19_bundle.stability, STABLE)
+ self.assertEqual(p19_bundle.recommended, 'yes')
def testDontPushIfNoChange(self):
# Make an online manifest that already has this bundle.
diff --git a/native_client_sdk/src/build_tools/update_nacl_manifest.py b/native_client_sdk/src/build_tools/update_nacl_manifest.py
index 18a4244..ecc683a 100755
--- a/native_client_sdk/src/build_tools/update_nacl_manifest.py
+++ b/native_client_sdk/src/build_tools/update_nacl_manifest.py
@@ -568,7 +568,7 @@ class Updater(object):
else:
bundle.stability = channel
# We always recommend the stable version.
- if channel == 'stable':
+ if bundle.stability == 'stable':
bundle.recommended = 'yes'
else:
bundle.recommended = 'no'