diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 31c9e080ed..f6c92cb620 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -403,9 +403,10 @@ python package_get_auto_pr() { | |||
403 | if not (host is None): | 403 | if not (host is None): |
404 | d.setVar("PRSERV_HOST", host) | 404 | d.setVar("PRSERV_HOST", host) |
405 | 405 | ||
406 | pkgv = d.getVar("PKGV", True) | ||
407 | |||
406 | # PR Server not active, handle AUTOINC | 408 | # PR Server not active, handle AUTOINC |
407 | if not d.getVar('PRSERV_HOST', True): | 409 | if not d.getVar('PRSERV_HOST', True): |
408 | pkgv = d.getVar("PKGV", True) | ||
409 | if 'AUTOINC' in pkgv: | 410 | if 'AUTOINC' in pkgv: |
410 | d.setVar("PKGV", pkgv.replace("AUTOINC", "0")) | 411 | d.setVar("PKGV", pkgv.replace("AUTOINC", "0")) |
411 | return | 412 | return |
@@ -428,11 +429,11 @@ python package_get_auto_pr() { | |||
428 | if conn is None: | 429 | if conn is None: |
429 | conn = oe.prservice.prserv_make_conn(d) | 430 | conn = oe.prservice.prserv_make_conn(d) |
430 | if conn is not None: | 431 | if conn is not None: |
431 | if "AUTOINC" in pv: | 432 | if "AUTOINC" in pkgv: |
432 | srcpv = bb.fetch2.get_srcrev(d) | 433 | srcpv = bb.fetch2.get_srcrev(d) |
433 | base_ver = "AUTOINC-%s" % version[:version.find(srcpv)] | 434 | base_ver = "AUTOINC-%s" % version[:version.find(srcpv)] |
434 | value = conn.getPR(base_ver, pkgarch, srcpv) | 435 | value = conn.getPR(base_ver, pkgarch, srcpv) |
435 | d.setVar("PKGV", pv.replace("AUTOINC", str(value))) | 436 | d.setVar("PKGV", pkgv.replace("AUTOINC", str(value))) |
436 | 437 | ||
437 | auto_pr = conn.getPR(version, pkgarch, checksum) | 438 | auto_pr = conn.getPR(version, pkgarch, checksum) |
438 | except Exception as e: | 439 | except Exception as e: |