From 4e0c08fd8bd0dd9ce6c9a7ebe08a5ea0cf4576d3 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 14 Mar 2012 22:42:42 -0400
Subject: [PATCH] Bug 735784 - Workaround for 13.0a1 users who are getting
 version downgrade errors. r=rstrong

---
 modules/libmar/tool/mar.c                        | 3 ++-
 toolkit/mozapps/update/updater/archivereader.cpp | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c
index 8ab53173872..90ffb7f4dd6 100644
--- a/modules/libmar/tool/mar.c
+++ b/modules/libmar/tool/mar.c
@@ -174,7 +174,8 @@ int main(int argc, char **argv) {
   case 'c': {
     struct ProductInformationBlock infoBlock;
     infoBlock.MARChannelID = MARChannelID;
-    infoBlock.productVersion = productVersion;
+    // Temporarily hardcoded - see Bug 735784
+    infoBlock.productVersion = "13.0a1";//productVersion;
     return mar_create(argv[2], argc - 3, argv + 3, &infoBlock);
   }
   case 'i': {
diff --git a/toolkit/mozapps/update/updater/archivereader.cpp b/toolkit/mozapps/update/updater/archivereader.cpp
index 2112e4e6109..34f30af2fc7 100644
--- a/toolkit/mozapps/update/updater/archivereader.cpp
+++ b/toolkit/mozapps/update/updater/archivereader.cpp
@@ -219,6 +219,8 @@ ArchiveReader::VerifyProductInformation(const char *MARChannelID,
     }
   }
 
+// Temporarily disabled - see Bug 735784
+#if 0
   if (rv == OK) {
     /* Compare both versions to ensure we don't have a downgrade
         -1 if appVersion is older than productInfoBlock.productVersion
@@ -235,6 +237,7 @@ ArchiveReader::VerifyProductInformation(const char *MARChannelID,
       rv = VERSION_DOWNGRADE_ERROR;
     }
   }
+#endif
 
   free((void *)productInfoBlock.MARChannelID);
   free((void *)productInfoBlock.productVersion);