[yocto] [auh][PATCH 01/20] upgradehelper.py: do not error out if testimage or buildhistory are enabled in bitbake conf, but not in AUH conf

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin at gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
---
 upgradehelper.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/upgradehelper.py b/upgradehelper.py
index 8e5466e..1356aef 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -240,12 +240,6 @@ class Updater(object):
                   " but isn't INHERIT in conf/local.conf, if you want"\
                   " to enable please set.")
                 exit(1)
-        else:
-            if 'buildhistory' in self.base_env['INHERIT']:
-                E(" Buildhistory was INHERIT in conf/local.conf"\
-                  " but buildhistory=yes isn't in upgrade-helper.conf,"\
-                  " if you want to enable please set.")
-                exit(1)
 
         return enabled
 
@@ -280,12 +274,6 @@ class Updater(object):
                   " but isn't INHERIT in conf/local.conf, if you want"\
                   " to enable please set.")
                 exit(1)
-        else:
-            if 'testimage' in self.base_env['INHERIT']:
-                E(" testimage was INHERIT in conf/local.conf"\
-                  " but testimage=yes isn't in upgrade-helper.conf,"\
-                  " if you want to enable please set.")
-                exit(1)
 
         return enabled
 
-- 
2.15.0