Signed-off-by: Quentin Schulz <[email protected]>
---
 - RESEND because I was not subscribed to the ML with this address already,
 - please ignore, resent only for archive purposes on the ML, this patch
   has been merged already

 upgradehelper.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/upgradehelper.py b/upgradehelper.py
index c2480f1..7ed7af4 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -201,9 +201,7 @@ class Updater(object):
         self.uh_dir = os.path.join(build_dir, "upgrade-helper")
         if not os.path.exists(self.uh_dir):
             os.mkdir(self.uh_dir)
-        self.uh_base_work_dir = settings.get('workdir', '')
-        if not self.uh_base_work_dir:
-            self.uh_base_work_dir = self.uh_dir
+        self.uh_base_work_dir = settings.get('workdir', self.uh_dir)
         if self.opts['layer_mode'] == 'yes':
             self.uh_base_work_dir = os.path.join(self.uh_base_work_dir,
                     self.opts['layer_name'])
-- 
2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#50280): https://lists.yoctoproject.org/g/yocto/message/50280
Mute This Topic: https://lists.yoctoproject.org/mt/76232365/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to