Skip to contentSkip to conversation

populate_sdk_ext/sign_rpm/sign_package_feed: Add missing getVar parameter

PATCH New Richard Purdie 1 participant 1 message Dec 10, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 populate_sdk_ext/sign_rpm/sign_package_feed: Add missing getVar parameter

We should always pass a parameter to getVar, add missing default value.

meta/classes/populate_sdk_ext.bbclass +1 -1
index 249ec36..18ff7a6 100644
@@ -144,7 +144,7 @@ python copy_buildsystem () {
         f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False))
 
         # Some classes are not suitable for SDK, remove them from INHERIT
-        f.write('INHERIT_remove = "%s"\n' % d.getVar('SDK_INHERIT_BLACKLIST'))
+        f.write('INHERIT_remove = "%s"\n' % d.getVar('SDK_INHERIT_BLACKLIST', False))
 
         # Bypass the default connectivity check if any
         f.write('CONNECTIVITY_CHECK_URIS = ""\n\n')
meta/classes/sign_package_feed.bbclass +1 -1
index 4263810..d89bc0b 100644
@@ -24,7 +24,7 @@ python () {
 
     # Set expected location of the public key
     d.setVar('PACKAGE_FEED_GPG_PUBKEY',
-             os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'),
+             os.path.join(d.getVar('STAGING_ETCDIR_NATIVE', False),
                                    'PACKAGE-FEED-GPG-PUBKEY'))
 }
 
meta/classes/sign_rpm.bbclass +1 -1
index f0c3dc9..bc916a7 100644
@@ -23,7 +23,7 @@ python () {
             raise_sanity_error("You need to define %s in the config" % var, d)
 
     # Set the expected location of the public key
-    d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'),
+    d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_ETCDIR_NATIVE', False),
                                             'RPM-GPG-PUBKEY'))
 }