From 5541cb83ac8104ed8884ff5e83f19bdd5ebfe7dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 7 Dec 2015 12:39:04 +0100 Subject: [PATCH] checkupdates: fix --auto build copy Also, remove origlines which hasn't been used in some time. --- fdroidserver/checkupdates.py | 5 ++--- fdroidserver/metadata.py | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index b7aaae5c..d1dfc8ff 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -29,6 +29,7 @@ import traceback import HTMLParser from distutils.version import LooseVersion import logging +import copy import common import metadata @@ -468,9 +469,7 @@ def checkupdates_app(app, first=True): logging.info("Refusing to auto update, since the latest build is newer") if not gotcur: - newbuild = latest.copy() - if newbuild.origlines: - del newbuild.origlines[:] + newbuild = copy.deepcopy(latest) newbuild.disable = False newbuild.vercode = app.CurrentVersionCode newbuild.version = app.CurrentVersion + suffix diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 9a82cc59..18f91310 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -1066,7 +1066,6 @@ def parse_txt_metadata(metadatapath): if len(parts) < 3: raise MetaDataException("Invalid build format: " + v + " in " + metafile.name) build = Build() - build.origlines = lines build.version = parts[0] build.vercode = parts[1] if parts[2].startswith('!'): -- 2.30.2