commit 40836b21dd61fb48a6528ec83238975aa63708b0
author Simran Basi <sbasi@chromium.org> Thu Mar 28 15:08:17 2013 -0700
committer Simran Basi <sbasi@chromium.org> Thu Mar 28 15:08:40 2013 -0700
tree 7ed75369915da469e243c9142415971da9989f35
parent 7706c4c34ada28b8ea5a99aae596fe6911b3eb29

Broke the devservers with error:
/home/chromeos-test/chromiumos/src/platform/dev/devserver.py 8080 --archive_dir /home/chromeos-test/images -t --production
Traceback (most recent call last):
  File "/home/chromeos-test/chromiumos/src/platform/dev/devserver.py", line 21, in <module>
    import autoupdate
  File "/home/chromeos-test/chromiumos/src/platform/dev/autoupdate.py", line 25, in <module>
    import update_payload
  File "/home/chromeos-test/chromiumos/src/platform/dev/host/lib/update_payload/__init__.py", line 10, in <module>
    from payload import Payload
  File "/home/chromeos-test/chromiumos/src/platform/dev/host/lib/update_payload/payload.py", line 10, in <module>
    import applier
  File "/home/chromeos-test/chromiumos/src/platform/dev/host/lib/update_payload/applier.py", line 24, in <module>
    import common
  File "/home/chromeos-test/chromiumos/src/platform/dev/host/lib/update_payload/common.py", line 11, in <module>
    import update_metadata_pb2
  File "/home/chromeos-test/chromiumos/src/platform/dev/host/lib/update_payload/update_metadata_pb2.py", line 3, in <module>
    from google.protobuf import descriptor
ImportError: No module named google.protobuf


Revert "devserver: return correct IsDelta value in Omaha response"

This reverts commit 2902159b01543a5e67fb89c0a2a86f0e0ad11614

Change-Id: I8aaf6394491592f18880808df801bc8c5200d5b6
Reviewed-on: https://gerrit.chromium.org/gerrit/46812
Reviewed-by: Simran Basi <sbasi@chromium.org>
Tested-by: Simran Basi <sbasi@chromium.org>

devserver.py

diff --git a/devserver.py b/devserver.py
index d3ad97c..b45a235 100755
--- a/devserver.py
+++ b/devserver.py
@@ -301,16 +301,9 @@
       file_sha256 = common_util.GetFileSha256(file_path)
     except os.error, e:
       raise DevServerError('failed to get info for file %s: %s' %
-                           (file_path, e))
-
-    is_delta = autoupdate.Autoupdate.IsDeltaFormatFile(file_path)
-
-    return json.dumps({
-        autoupdate.Autoupdate.SIZE_ATTR: file_size,
-        autoupdate.Autoupdate.SHA1_ATTR: file_sha1,
-        autoupdate.Autoupdate.SHA256_ATTR: file_sha256,
-        autoupdate.Autoupdate.ISDELTA_ATTR: is_delta
-    })
+                           (file_path, str(e)))
+    return json.dumps(
+        {'size': file_size, 'sha1': file_sha1, 'sha256': file_sha256})
 
 
 class DevServerRoot(object):