зеркало из https://github.com/mozilla/pjs.git
Bug 735969 - Revert the disable version downgrade check workaround from Bug 735784. r=rstrong
This commit is contained in:
Родитель
f36fa8f117
Коммит
c596f946fd
|
@ -174,8 +174,7 @@ int main(int argc, char **argv) {
|
|||
case 'c': {
|
||||
struct ProductInformationBlock infoBlock;
|
||||
infoBlock.MARChannelID = MARChannelID;
|
||||
/* Temporarily hardcoded - see Bug 735784 */
|
||||
infoBlock.productVersion = "13.0a1";/*productVersion;*/
|
||||
infoBlock.productVersion = productVersion;
|
||||
return mar_create(argv[2], argc - 3, argv + 3, &infoBlock);
|
||||
}
|
||||
case 'i': {
|
||||
|
|
|
@ -219,8 +219,6 @@ 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
|
||||
|
@ -237,7 +235,6 @@ ArchiveReader::VerifyProductInformation(const char *MARChannelID,
|
|||
rv = VERSION_DOWNGRADE_ERROR;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
free((void *)productInfoBlock.MARChannelID);
|
||||
free((void *)productInfoBlock.productVersion);
|
||||
|
|
Загрузка…
Ссылка в новой задаче