Version 3.0.5+toward_3.0.6_20140530170941

A modification was made so that -H, -h and -V options are not affected by the implementation status of the ports tree.

	modified:   bin/portsreinstall
	modified:   lib/libconf.sh
	modified:   lib/libpkgsys.sh
	modified:   man/portsreinstall.8

diff --git a/bin/portsreinstall b/bin/portsreinstall
index 94d7a69..18b72fa 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.6
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.5+toward_3.0.6_20140530040947
+MYVERSION=3.0.5+toward_3.0.6_20140530170941
 COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[0-9]+|3\.0\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}
@@ -40,7 +40,6 @@ LIBDIR=${MYPREFIX}/lib/${APPNAME}
 
 misc_init_vardefs
 temp_trap_init
-conf_setup_envs
 DBDIR=/var/tmp/${APPNAME}.db
 CONFFILE=${MYPREFIX}/etc/${APPNAME}.conf
 PKGTOOLSCONF=${MYPREFIX}/etc/pkgtools.conf
@@ -93,6 +92,10 @@ then
        exit
 fi
 
+# ============= Set up variables for environment of ports and packages =============
+conf_setup_ports_envs
+conf_setup_packages_envs
+
 # ============= Execute command operations before getting the temporary database ready =============
 command_exec_before_db_creation "$@"
 

diff --git a/lib/libconf.sh b/lib/libconf.sh
index 119bf91..f63a728 100644 (file)
--- a/lib/libconf.sh
+++ b/lib/libconf.sh
@@ -9,6 +9,13 @@
 # ============= Set up environment variables =============
 conf_setup_ports_envs ()
 {
+       local tmp_work
+       tmp_work=${TMPDIR}/conf_setup_ports_envs:work
+       rm -rf "$tmp_work"
+       mkdir "$tmp_work"
+       PORTSDIR=${PORTSDIR:-`[ -e /etc/make.conf ] && make -C "$tmp_work" -f /etc/make.conf -V PORTSDIR 2> /dev/null`} || :
+       PORTSDIR=${PORTSDIR:-/usr/ports}
+       pkgsys_chk_ports_tree_implementation
        PORTS_MOVED_DB=${PORTSDIR}/MOVED
        PORTS_INDEX_DB=${PORTSDIR}/INDEX-`uname -r | cut -d . -f 1`
        if [ ! -e "${PORTS_INDEX_DB}" ]
@@ -23,15 +30,9 @@ conf_setup_ports_envs ()
 }
 
 # ============= Set up environment variables =============
-conf_setup_envs ()
+conf_setup_packages_envs ()
 {
-       local tmp_work
-       tmp_work=${TMPDIR}/conf_setup_envs:work
-       rm -rf "$tmp_work"
-       mkdir "$tmp_work"
-       PORTSDIR=${PORTSDIR:-`[ -e /etc/make.conf ] && make -C "$tmp_work" -f /etc/make.conf -V PORTSDIR 2> /dev/null`} || :
-       PORTSDIR=${PORTSDIR:-/usr/ports}
-       pkgsys_chk_sys
+       local var
        for var in LOCALBASE PORT_DBDIR LINUXBASE DISTDIR PACKAGES PKGREPOSITORYSUBDIR PKGREPOSITORY
        do
                val=`pkgsys_sysvar $var`
@@ -47,7 +48,6 @@ conf_setup_envs ()
        PACKAGECHECKSUMDIR=${PACKAGEDIR:-'pub/FreeBSD/ports/%s/packages-%s/All/'}
        PACKAGEROOTS=${PACKAGEROOTS:-${PACKAGECHECKSUMROOTS}}
        PACKAGEDIR=${PACKAGEDIR:-${PACKAGECHECKSUMDIR}}
-       conf_setup_ports_envs
 }
 
 # ============= Parse configuration variables given for each port glob =============

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index 24927cc..77487d3 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -16,7 +16,7 @@ PKGSYS_AVR_REFETCH_TIMES_PER_SITE=1   # Average number (integer) of retrials for r
 PKGSYS_AVR_REFETCH_TIMES_FOR_CHKSUMERR=2       #  Number (integer) of retrials for check sum error in retrieving a package
 
 # ============= Check implementation of the ports tree =============
-pkgsys_chk_sys ()
+pkgsys_chk_ports_tree_implementation ()
 {
        local var tmp_work
        if [ ! -d "${PORTSDIR}" ]

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index be316bf..e3d68e0 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -916,7 +916,8 @@ Configuration file of \fBportupgrade\fR(1).
 .RS
 [BUG FIX] Command \fBprepare\fR was possibly aborted at a port any of whose requirements or dependents is obsolete.
 .PP
-[BUG FIX] Silently failed to launch when the ports tree is missing or broken.
+[BUG FIX] It silently failed to launch if the ports tree is missing or broken.
+.RE
 .TP
 3.0.5 (14 December 2013)
 .RS