summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/insane.bbclass1
-rw-r--r--meta/classes/package.bbclass1
-rw-r--r--meta/classes/package_rpm.bbclass2
3 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index fb1802223a..3ed5581949 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -718,7 +718,6 @@ def package_qa_check_deps(pkg, pkgdest, skip, d):
718 rvar = bb.utils.explode_dep_versions2(localdata.getVar(var, True) or "") 718 rvar = bb.utils.explode_dep_versions2(localdata.getVar(var, True) or "")
719 except ValueError as e: 719 except ValueError as e:
720 bb.fatal("%s_%s: %s" % (var, pkg, e)) 720 bb.fatal("%s_%s: %s" % (var, pkg, e))
721 raise e
722 for dep in rvar: 721 for dep in rvar:
723 for v in rvar[dep]: 722 for v in rvar[dep]:
724 if v and not v.startswith(('< ', '= ', '> ', '<= ', '>=')): 723 if v and not v.startswith(('< ', '= ', '> ', '<= ', '>=')):
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0f2743d106..02a1460624 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -372,7 +372,6 @@ python package_get_auto_pr() {
372 auto_pr=prserv_get_pr_auto(d) 372 auto_pr=prserv_get_pr_auto(d)
373 except Exception as e: 373 except Exception as e:
374 bb.fatal("Can NOT get PRAUTO, exception %s" % str(e)) 374 bb.fatal("Can NOT get PRAUTO, exception %s" % str(e))
375 return
376 if auto_pr is None: 375 if auto_pr is None:
377 if d.getVar('PRSERV_LOCKDOWN', True): 376 if d.getVar('PRSERV_LOCKDOWN', True):
378 bb.fatal("Can NOT get PRAUTO from lockdown exported file") 377 bb.fatal("Can NOT get PRAUTO from lockdown exported file")
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 25b14dd79d..8935c9fc6a 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -672,12 +672,10 @@ python write_specfile () {
672 pkgdest = d.getVar('PKGDEST', True) 672 pkgdest = d.getVar('PKGDEST', True)
673 if not pkgdest: 673 if not pkgdest:
674 bb.fatal("No PKGDEST") 674 bb.fatal("No PKGDEST")
675 return
676 675
677 outspecfile = d.getVar('OUTSPECFILE', True) 676 outspecfile = d.getVar('OUTSPECFILE', True)
678 if not outspecfile: 677 if not outspecfile:
679 bb.fatal("No OUTSPECFILE") 678 bb.fatal("No OUTSPECFILE")
680 return
681 679
682 # Construct the SPEC file... 680 # Construct the SPEC file...
683 srcname = strip_multilib(d.getVar('PN', True), d) 681 srcname = strip_multilib(d.getVar('PN', True), d)