Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at 2013-12-09 19:18:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/post-build-checks (Old) and /work/SRC/openSUSE:Factory/.post-build-checks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "post-build-checks" Changes: -------- --- /work/SRC/openSUSE:Factory/post-build-checks/post-build-checks.changes 2013-10-14 14:30:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.post-build-checks.new/post-build-checks.changes 2013-12-09 19:18:08.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Dec 9 15:41:16 UTC 2013 - [email protected] + +- merge rest of quoting fixes from schwab + +------------------------------------------------------------------- +Mon Dec 9 14:54:26 UTC 2013 - [email protected] + +- fix quoting in libtool deps check + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-1.0/checks/12-check-libtool-deps new/post-build-checks-1.0/checks/12-check-libtool-deps --- old/post-build-checks-1.0/checks/12-check-libtool-deps 2013-10-11 12:59:16.000000000 +0200 +++ new/post-build-checks-1.0/checks/12-check-libtool-deps 2013-12-09 16:40:02.000000000 +0100 @@ -36,7 +36,7 @@ function get_ld_library_path { local FILE local -a INCLUDES - for FILE in $@ ; do + for FILE in "$@"; do if ! test -r "$BUILD_ROOT$FILE" ; then continue fi @@ -50,8 +50,8 @@ done exec 3<&- done - for FILE in ${INCLUDES[@]} ; do - eval get_ld_library_path $FILE + for FILE in "${INCLUDES[@]}" ; do + eval get_ld_library_path "$FILE" done } get_ld_library_path /etc/ld.so.conf @@ -61,14 +61,14 @@ # Assign file to RPM package. # assign_rpm file function assign_rpm { - ASSIGN_RPM=$(chroot '$BUILD_ROOT' rpm --queryformat '%{NAME}\n' -qf $1) + ASSIGN_RPM=$(chroot "$BUILD_ROOT" rpm --queryformat '%{NAME}\n' -qf "$1") } # Prepare for rpm_find_all_deps and clean after rpm_find_all_deps. # rpm_find_all_deps_reset function rpm_find_all_deps_reset { unset DUMMY ${!rpmsym_*} - rm -f $BUILD_ROOT/tmp/all-requires $BUILD_ROOT/tmp/all-deps + rm -f "$BUILD_ROOT"/tmp/all-requires "$BUILD_ROOT"/tmp/all-deps } # List all dependent packages exploring only explicit dependencies. @@ -86,12 +86,11 @@ SYMBOL_NAME=know_$SYMBOL_NAME eval "known=\$$SYMBOL_NAME" if test -z "$known"; then - # the double quotes are necessary to retain the line endings - known="$(chroot '$BUILD_ROOT' rpm -q --requires $1 2>/dev/null)" + known=$(chroot "$BUILD_ROOT" rpm -q --requires $1 2>/dev/null) if test $? -gt 0 ; then known=nonrpm fi - eval "$SYMBOL_NAME=\"$known\"" + eval "$SYMBOL_NAME=\$known" fi if test "$known" = "nonrpm"; then return @@ -107,9 +106,9 @@ SYMBOL_NAME=${SYMBOL_NAME//)/_CB_} SYMBOL_NAME=${SYMBOL_NAME//[^A-Za-z0-9]/_X_} SYMBOL_NAME=rpmsym_$SYMBOL_NAME - eval "if test -z \"\$$SYMBOL_NAME\" ; then - SYMBOLS[${#SYMBOLS[@]}]='$SYMBOL' - fi" + if eval test -z \"\$$SYMBOL_NAME\" ; then + SYMBOLS[${#SYMBOLS[@]}]=$SYMBOL + fi eval "$SYMBOL_NAME=1" done <<<"$known" for SYMBOL in ${SYMBOLS[@]} ; do @@ -124,7 +123,7 @@ PACK=${PACK##$BUILD_ROOT} : > "$BUILD_ROOT/tmp/missings-$ASSIGN_RPM" LAST_RPM= - for LA in $(chroot '$BUILD_ROOT' rpm -qlp $PACK | grep '.*/lib.*/.*\.la$') ; do + for LA in $(chroot "$BUILD_ROOT" rpm -qlp $PACK | grep '.*/lib.*/.*\.la$') ; do LOCAL_LIBRARY_PATH=$BUILD_LD_LIBRARY_PATH assign_rpm $LA RPM=$ASSIGN_RPM @@ -133,8 +132,8 @@ rpm_find_all_deps $RPM >"$BUILD_ROOT/tmp/all-deps" LAST_RPM=$RPM fi - test "$(source $BUILD_ROOT$LA; echo $shouldnotlink)" = yes && continue - for LIB in $(source $BUILD_ROOT$LA ; echo "$dependency_libs") ; do + test "$(source "$BUILD_ROOT$LA"; echo "$shouldnotlink")" = yes && continue + for LIB in $(source "$BUILD_ROOT$LA" ; echo "$dependency_libs") ; do case $LIB in -L* ) LOCAL_LIBRARY_PATH="$LOCAL_LIBRARY_PATH ${LIB#-L}" @@ -143,11 +142,11 @@ -l* ) DEPLIB= for DIR in $LOCAL_LIBRARY_PATH ; do - if test -f $BUILD_ROOT$DIR/lib${LIB#-l}.so ; then + if test -f "$BUILD_ROOT$DIR/lib${LIB#-l}.so" ; then DEPLIB=$DIR/lib${LIB#-l}.so break fi - if test -f $BUILD_ROOT$DIR/lib${LIB#-l}.a ; then + if test -f "$BUILD_ROOT$DIR/lib${LIB#-l}.a" ; then DEPLIB=$DIR/lib${LIB#-l}.a break fi @@ -168,9 +167,9 @@ esac assign_rpm $DEPLIB # FIXME: Can it happen, that library is not part of any package? - if ! grep -q ^$ASSIGN_RPM'\( \|$\)' $BUILD_ROOT/tmp/all-deps ; then - test -f $BUILD_ROOT/tmp/missing-$RPM && grep -q "$ASSIGN_RPM" $BUILD_ROOT/tmp/missing-$RPM && continue - echo "$ASSIGN_RPM" >> $BUILD_ROOT/tmp/missing-$RPM + if ! grep -q ^$ASSIGN_RPM'\( \|$\)' "$BUILD_ROOT"/tmp/all-deps ; then + test -f "$BUILD_ROOT"/tmp/missing-$RPM && grep -q "$ASSIGN_RPM" "$BUILD_ROOT"/tmp/missing-$RPM && continue + echo "$ASSIGN_RPM" >> "$BUILD_ROOT"/tmp/missing-$RPM if test "$ASSIGN_RPM" != "$RPM" ; then if test "${RPM#*-devel}" ; then echo "Warning: Missing \"Requires: $ASSIGN_RPM\" in dependency chain ($LA from $RPM requires $DEPLIB)." @@ -187,18 +186,18 @@ echo "... testing devel dependencies required by libtool .la files" -if fgrep -q skip-check-libtool-deps $BUILD_ROOT$TOPDIR/SOURCES/$PNAME.spec ; then +if fgrep -q skip-check-libtool-deps "$BUILD_ROOT"$TOPDIR/SOURCES/$PNAME.spec ; then echo " skipped by \"skip-check-libtool-deps\"" exit 0 fi echo " (can be skipped by \"skip-check-libtool-deps\" anywhere in spec)" -mount -n -tproc none $BUILD_ROOT/proc +mount -n -tproc none "$BUILD_ROOT"/proc shopt -s nullglob IFS=$IFS":," -for RPM in $BUILD_ROOT$TOPDIR/RPMS/*/*.rpm ; do +for RPM in "$BUILD_ROOT"$TOPDIR/RPMS/*/*.rpm ; do check_rpm_requires $RPM done rpm_find_all_deps_reset -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
