[yocto] [[AUH] 6/6] upgradehelper: Remove deprecated setting drop_previous_commits.
Aníbal Limón
anibal.limon at linux.intel.com
Tue Dec 1 14:03:41 PST 2015
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 at 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
More information about the yocto
mailing list