From 94ef8414e19059c2a903fdb3882acf67403821e5 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Fri, 24 Jun 2016 10:14:49 +0200
Subject: [PATCH] beesh: join together verify_new_package_variables and
 extract_new_package_variables

we want to expand the handling of variables changed by the beefile a bit
which is easier implement and follow when done in a single function
---
 src/beesh.sh.in | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index b7b91c5..d0b7780 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -732,7 +732,7 @@ function save_current_package_variables() {
     oPKGREVISION=${PKGREVISION}
 }
 
-function verify_new_package_variables() {
+function extract_new_package_variables() {
     nPKGFULLNAME="${PKGNAME}${PKGEXTRANAME:+_${PKGEXTRANAME}}"
 
     if [ "${oPKGFULLNAME}" != "${PKGFULLNAME}" ] ; then
@@ -763,9 +763,7 @@ function verify_new_package_variables() {
         fi
     fi
     PKGFULLVERSION="${PKGVERSION}${PKGEXTRAVERSION:+_${PKGEXTRAVERSION}}"
-}
 
-function extract_new_package_variables() {
     if [ "${PKGNAME}" != "${oPKGNAME}" ] ; then
         # pkgname changed! we allow prefixing 'anything-' to the packagename
         if [ "${PKGNAME}" != "${PKGNAME/-${oPKGNAME}}-${oPKGNAME}" ] ; then
@@ -989,7 +987,6 @@ save_current_package_variables
 # now set PKGARCH if set or changed by user via ARCH=.. and not given via file.arch.bee
 : ${PKGARCH:=${ARCH}}
 
-verify_new_package_variables
 extract_new_package_variables
 
 config_handle_deprecated_beefile