535454 - [AMO] Local patch for AMO and SAMO

Status: RESOLVED FIXED

(Infrastructure & Operations Graveyard :: WebOps: Other, task)

Description

[Wil Clouser [:clouserw]]

We've fixed a bug with our beta channel code and ask that you apply attachment 417573 [details] [diff] [review] to production AMO and services.amo.  We're applying this off cycle because labs needs it for their weave release.

Comment 1

[Wil Clouser [:clouserw]]

and for some reason it didn't link the attachment...

https://bug534752.bugzilla.mozilla.org/attachment.cgi?id=417573

Comment 2

[Jeff Balogh (:jbalogh)]

Attachment: patch for bug 534752

This is a better patch that the one Wil listed; it includes a fix for a bug that would probably only manifest itself on preview, but a bug nonetheless.

Comment 3

[Jeff Balogh (:jbalogh)]

BTW, the patch was qa'd on preview by stephend. It was committed after the original patch in r57921, detailed in bug 534752 comment 7.

Comment 4

[Ragavan S [:rags]]

Thanks a lot for the quick fix. 

When will this be pushed live? Weave Sync 1.0b3 was released last Friday, but our users are still not seeing it.

Comment 5

[Jeremy Orem [:oremj]]

[root@mradm02 addons.mozilla.org-remora]# curl 'https://bug535454.bugzilla.mozilla.org/attachment.cgi?id=418062' | patch -p1 
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  1452  100  1452    0     0  35881      0 --:--:-- --:--:-- --:--:--     0
patching file site/app/webroot/services/update.php
Hunk #1 succeeded at 195 with fuzz 1.


[root@mradm02 addons.mozilla.org-remora]# svn diff site/

Index: site/app/webroot/services/update.php
===================================================================
--- site/app/webroot/services/update.php	(revision 57619)
+++ site/app/webroot/services/update.php	(working copy)
@@ -195,8 +195,20 @@
         
         if ($addon['status'] == STATUS_PUBLIC) {
             if ($want_beta) {
-                // Beta versions stay on the beta channel.
-                $where = 'WHERE files.status = '.STATUS_BETA;
+                $version_status = mysql_fetch_array(mysql_query("
+                    SELECT versions.id, status
+                    FROM files INNER JOIN versions
+                    ON files.version_id = versions.id
+                    WHERE versions.addon_id = {$addon['id']}
+                      AND versions.version = '{$sql['version']}'
+                    LIMIT 1"));
+
+                // Version numbers that look like betas should stay on the same
+                // channel as the version currently in use.  That way, beta
+                // versions stay on the beta channel, while public versions
+                // remain on the public channel.
+                $status = isset($version_status['status']) ? $version_status['status'] : STATUS_BETA;
+                $where = 'WHERE files.status = '.$status;
             } else {
                 // If public, we only pull public files
                 $where = 'WHERE files.status = '.STATUS_PUBLIC;

Comment 6

[Jeremy Orem [:oremj]]

SAMO has been updated as well.