All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Aníbal Limón" <anibal.limon@linux.intel.com>
To: yocto@yoctoproject.org
Cc: paul.eggleton@linux.intel.com
Subject: [[AUH] 6/6] upgradehelper: Remove deprecated setting drop_previous_commits.
Date: Tue,  1 Dec 2015 16:03:41 -0600	[thread overview]
Message-ID: <1449007421-26206-7-git-send-email-anibal.limon@linux.intel.com> (raw)
In-Reply-To: <1449007421-26206-1-git-send-email-anibal.limon@linux.intel.com>

Since recipe upgrades are done in isolate manner cleaning the repo
for every recipe [1] the drop_previous_commits becomes deprecated.

Also now we have Testimage integration phase that handles/reports
this kind of errors.

[1] http://git.yoctoproject.org/cgit/cgit.cgi/auto-upgrade-helper/commit/?h=boot_images_v2&id=8769030a02753f09ed6b5e7c98ed1c442a51a466

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
 README           |  3 ---
 upgradehelper.py | 20 --------------------
 2 files changed, 23 deletions(-)

diff --git a/README b/README
index 63c3b39..1b73034 100644
--- a/README
+++ b/README
@@ -59,9 +59,6 @@ clean_sstate=yes
 # clean tmp directory before upgrading
 clean_tmp=yes
 
-# keep previous commits or not
-drop_previous_commits=yes
-
 # machines to test build with
 machines=qemux86 qemux86-64 qemuarm qemumips qemuppc
 
diff --git a/upgradehelper.py b/upgradehelper.py
index 19327c8..d9fa48a 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -276,26 +276,6 @@ class Updater(object):
 
     # this function will be called at the end of each recipe upgrade
     def pkg_upgrade_handler(self, pkg_ctx):
-        if self.opts['interactive'] and pkg_ctx['error'] and pkg_ctx['patch_file']:
-            answer = "N"
-            I(" %s: Do you want to keep the changes? (y/N)" % pkg_ctx['PN'])
-            answer = sys.stdin.readline().strip().upper()
-
-            if answer == '' or answer == 'N':
-                I(" %s: Dropping changes from git ..." % pkg_ctx['PN'])
-                self.git.reset_hard(1)
-                self.git.clean_untracked()
-                return
-
-        # drop last upgrade from git. It's safer this way if the upgrade has
-        # problems and other recipes depend on it. Give the other recipes a
-        # chance...
-        if (settings.get("drop_previous_commits", "no") == "yes" and
-                not pkg_ctx['error']) or (pkg_ctx['error'] and pkg_ctx['patch_file']):
-            I(" %s: Dropping changes from git ..." % pkg_ctx['PN'])
-            self.git.reset_hard(1)
-            self.git.clean_untracked()
-
         mail_header = \
             "Hello,\n\nYou are receiving this email because you are the maintainer\n" \
             "of *%s* recipe and this is to let you know that the automatic attempt\n" \
-- 
2.1.4



      parent reply	other threads:[~2015-12-01 22:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-01 22:03 [[AUH] 0/6] Integration error handling and enhacements Aníbal Limón
2015-12-01 22:03 ` [[AUH] 1/6] recipe/git.py: Add missing import of re module Aníbal Limón
2015-12-01 22:03 ` [[AUH] 2/6] upgradehelper.py: Add support for preserve logs in workdir Aníbal Limón
2015-12-01 22:03 ` [[AUH] 3/6] upgradehelper.py: Add support for specify what image test Aníbal Limón
2015-12-01 22:03 ` [[AUH] 4/6] testimage/ptest: Add require of ptest-pkgs in EXTRA_IMAGE_FEATURES Aníbal Limón
2015-12-11  1:31   ` Paul Eggleton
2015-12-01 22:03 ` [[AUH] 5/6] testimage: Add handling of IntegrationError Aníbal Limón
2015-12-01 22:03 ` Aníbal Limón [this message]

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=1449007421-26206-7-git-send-email-anibal.limon@linux.intel.com \
    --to=anibal.limon@linux.intel.com \
    --cc=paul.eggleton@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.