From 0e59c1ee07027ab82689b263f9d422089731bd92 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 10 Nov 2011 13:28:27 +0100 Subject: [PATCH] xbps-src: fixed index generation with -B without -D. --- xbps-src/shutils/pkgtarget_funcs.sh.in | 21 ++++----------------- xbps-src/xbps-src.sh.in | 2 +- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in index e4f6da262d..cc8b12bf53 100644 --- a/xbps-src/shutils/pkgtarget_funcs.sh.in +++ b/xbps-src/shutils/pkgtarget_funcs.sh.in @@ -187,23 +187,10 @@ install_pkg() # XBPS_PREFER_BINPKG_DEPS is set. # autoremove_pkg_dependencies $KEEP_AUTODEPS || return $? - - # Build binary package and update local repo index if - # -B is set. - if [ -n "$BUILD_BINPKG" ]; then - xbps_make_binpkg - rval=$? - if [ "$rval" -ne 0 -a "$rval" -ne 6 ]; then - return $rval - elif [ "$rval" -eq 6 ]; then - # binpkg exists no need to update pkg-index in repo. - : - else - msg_normal "Updating pkg-index for local repository at:\n" - msg_normal " $XBPS_PACKAGESDIR\n" - ${XBPS_REPO_CMD} genindex ${XBPS_PACKAGESDIR} 2>/dev/null - fi - fi + # + # Build binary package and update local repo index if -B is set. + # + _build_pkg_and_update_repos return $? } diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in index 3dc3b8d675..1ba0d3dbd2 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=20111109 +readonly XBPS_SRC_BUILD_VERSION=20111110 XBPS_CONFIG_FILE=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf PROGNAME=$(basename $0)