From 871e7aad4aa66d108f5424bfda44039bb604cfa6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 15 Nov 2011 11:04:31 +0100 Subject: [PATCH] xbps-src: verify_rundeps: make sure to unset local vars. --- xbps-src/shutils/verify_rundeps.sh | 3 +-- xbps-src/xbps-src.sh.in | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xbps-src/shutils/verify_rundeps.sh b/xbps-src/shutils/verify_rundeps.sh index 08db60c23e..2be647601e 100644 --- a/xbps-src/shutils/verify_rundeps.sh +++ b/xbps-src/shutils/verify_rundeps.sh @@ -100,6 +100,7 @@ verify_rundeps() # above, the mapping is done thru the mapping_shlib_binpkg.txt file. # for f in ${verify_deps}; do + unset j rdep _rdep rdepcnt # Bail out if maplib is not aware for this lib rdep="$(grep "$f" $maplib|awk '{print $2}')" rdepcnt="$(grep "$f" $maplib|awk '{print $2}'|wc -l)" @@ -112,7 +113,6 @@ verify_rundeps() done if [ -n "$found" ]; then echo " SONAME: $f <-> $pkgname (ignored)" - unset found continue else echo " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!" @@ -144,7 +144,6 @@ verify_rundeps() if find_rundep ${_rdep}; then Add_dependency run ${_rdep} fi - unset rdep _rdep rdepcnt done # # If pkg uses any SONAME not known, error out. diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in index 480eb07348..2dbd0ed291 100644 --- a/xbps-src/xbps-src.sh.in +++ b/xbps-src/xbps-src.sh.in @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- -readonly XBPS_SRC_BUILD_VERSION=20111115 +readonly XBPS_SRC_BUILD_VERSION=20111115-1 XBPS_CONFIG_FILE=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf PROGNAME=$(basename $0)