All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: yocto@yoctoproject.org
Subject: [PATCH 1/2] Do not skip packages that were attempted recently.
Date: Wed, 21 Mar 2018 18:19:16 +0200	[thread overview]
Message-ID: <20180321161917.13028-1-alexander.kanavin@linux.intel.com> (raw)

This was undocumented and made a number of hardcoded assumptions.
The options were to make it configurable, or just remove the logic,
and I chose the latter.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 upgradehelper.py | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/upgradehelper.py b/upgradehelper.py
index b5e696e..8fb27d3 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -564,17 +564,6 @@ class UniverseUpdater(Updater):
                 E(" -t is only supported when upgrade one recipe\n")
                 exit(1)
 
-        # read history file
-        self.history_file = os.path.join(get_build_dir(), "upgrade-helper", "history.uh")
-        self.history = dict()
-        if os.path.exists(self.history_file):
-            with open(self.history_file) as history_file:
-                for line in history_file:
-                    line = line.strip()
-                    self.history[line.split(',')[0]] = [line.split(',')[1],
-                                                        line.split(',')[2],
-                                                        line.split(',')[3],
-                                                        line.split(',')[4]]
     def _get_recipes_by_layer(self):
         recipes = []
 
@@ -689,21 +678,6 @@ class UniverseUpdater(Updater):
                         (pn, maintainer))
                 return False
 
-        if pn in self.history:
-            # did we already try this version?
-            if next_ver == self.history[pn][0]:
-                retry_delta = \
-                    date.toordinal(date.today()) - \
-                    date.toordinal(datetime.strptime(self.history[pn][2], '%Y-%m-%d'))
-                # retry recipes that had fetch errors or other errors after
-                # more than 30 days
-                if (self.history[pn][3] == str(FetchError()) or
-                        self.history[pn][3] == str(Error())) and retry_delta > 30:
-                    return True
-
-                D(" Skipping upgrade of %s: is in history and not 30 days passed" % pn)
-                return False
-
         # drop native/cross/cross-canadian recipes. We deal with native
         # when upgrading the main recipe but we keep away of cross* pkgs...
         # for now
@@ -727,22 +701,8 @@ class UniverseUpdater(Updater):
 
         return pkgs_list
 
-    def _update_history(self, pn, new_ver, maintainer, upgrade_status):
-        with open(self.history_file + ".tmp", "w+") as tmp_file:
-            if os.path.exists(self.history_file):
-                with open(self.history_file) as history:
-                    for line in history:
-                        if not line.startswith(pn):
-                            tmp_file.write(line)
-            tmp_file.write(pn + "," + new_ver + "," + maintainer +
-                           "," + date.isoformat(date.today()) + "," +
-                           upgrade_status + "\n")
-        os.rename(self.history_file + ".tmp", self.history_file)
-
     def pkg_upgrade_handler(self, pkg_ctx):
         super(UniverseUpdater, self).pkg_upgrade_handler(pkg_ctx)
-        self._update_history(pkg_ctx['PN'], pkg_ctx['NPV'], pkg_ctx['MAINTAINER'],
-                self._get_status_msg(pkg_ctx['error']))
 
     def run(self):
         self._prepare()
-- 
2.16.1



             reply	other threads:[~2018-03-21 16:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-21 16:19 Alexander Kanavin [this message]
2018-03-21 16:19 ` [PATCH 2/2] When 'devtool upgrade' fails to rebase patches, stop and report a failure Alexander Kanavin
2018-03-21 16:20 ` [PATCH 1/2] Do not skip packages that were attempted recently Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180321161917.13028-1-alexander.kanavin@linux.intel.com \
    --to=alexander.kanavin@linux.intel.com \
    --cc=yocto@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.