Version 3.1.1+toward_3.2.0_20141228193746

[portsreinstall/current.git] / lib / libpkgsys.sh

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index b2bc37e..773c43a 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -58,6 +58,12 @@ pkgsys_is_pkgtool ()
        esac
 }
 
+# ============= Check whether a port is indispensable for package operations =============
+pkgsys_is_necessary_pkgtool ()
+{
+       [ x"$WITH_PKGNG" = x'yes' -a "x$1" = x'ports-mgmt/pkg' ]
+}
+
 # ============= Check whether the dialog for selecting port options is dialog4ports =============
 pkgsys_is_dialog4ports_used ()
 {
@@ -332,9 +338,20 @@ pkgsys_def_pkgtools ()
                }
                pkg_check_sanity ()
                {
-                       local pkg
+                       local pkg tmp_stdout tmp_stderr
                        pkg=$1
-                       pkg check -s "$pkg" 2> /dev/null
+                       tmp_stdout=${TMPDIR}/pkgng:pkg_check_sanity:stdout
+                       tmp_stderr=${TMPDIR}/pkgng:pkg_check_sanity:stderr
+                       pkg check -s "$pkg" > $tmp_stdout 2> $tmp_stderr || :
+                       grep '^[^:]*: checksum mismatch for ' "$tmp_stderr" | sed 's/^[^:]*: checksum mismatch for //' || :
+                       if grep -q '^pkg: .*: No such file or directory$' "$tmp_stderr"
+                       then
+                               pkg info -ql "$pkg" | while read filepath
+                               do
+                                       [ -e "$filepath" ] || echo "$filepath"
+                               done
+                       fi
+                       :
                }
                pkg_which ()
                {
@@ -353,6 +370,8 @@ pkgsys_def_pkgtools ()
                pkg_delete_f ()
                {
                        pkg delete -fqy "$@"
+                       pkg info -e "$@" || return 0    # Countermeasure for a bug found for pkg-1.3.4 (at least not until 1.2.7_4)
+                       pkg delete -fy "$@"
                }
                pkg_add_tools ()
                {
@@ -476,7 +495,8 @@ pkgsys_def_pkgtools ()
                        PKGNG_AUTODEPS=NO
                        PKGNG_PORTAUDIT_SITE='http=//portaudit.FreeBSD.org/auditfile.tbz'
                        # Load configuration for pkg(1)
-                       pkg_conf=`pkg query %Fp pkg | grep '/etc/pkg\.conf\.sample$' | sed 's/\.sample$//'`
+                       pkg_conf=`pkg query %Fp pkg 2> /dev/null | grep '/etc/pkg\.conf\.sample$' | sed 's/\.sample$//'` || :
+                       [ -n "$pkg_conf" ] || pkg_conf=${MYPREFIX}/etc/pkg.conf
                        grep -v -e '^[[:space:]]*#' -e '^[[:space:]]*$' "$pkg_conf" 2> /dev/null \
                                | grep -e '^[[:space:]]*[A-Z0-9_]*[[:space:]]*:[[:space:]]*.*' \
                                | while read srcline
@@ -591,9 +611,13 @@ pkgsys_def_pkgtools ()
                }
                pkg_check_sanity ()
                {
-                       local pkg
+                       local pkg tmp_stdout tmp_stderr
                        pkg=$1
-                       pkg_info -qg "$pkg" 2> /dev/null
+                       tmp_stdout=${TMPDIR}/pkgng:pkg_check_sanity:stdout
+                       tmp_stderr=${TMPDIR}/pkgng:pkg_check_sanity:stderr
+                       pkg_info -qg "$pkg" > $tmp_stdout 2> $tmp_stderr || :
+                       grep ' fails the original MD5 checksum$' "$tmp_stdout" | sed 's/ fails the original MD5 checksum$//' || :
+                       grep "^pkg_info: .* doesn't exist$" "$tmp_stderr" | sed -E "s/^pkg_info: (.*) doesn't exist$/\1/" || :
                }
                pkg_which ()
                {
@@ -811,7 +835,7 @@ pkgsys_eval_ports_glob ()
 # ============= Create a back-up package archive =============
 pkgsys_create_backup_pkg ()
 {
-       local pkgname dstdir origin backup_pkg_old origin_regexp pkgname_ptn backup_pkg pkgpath
+       local pkgname dstdir origin backup_pkg_old pkgname_ptn backup_pkg dbpath pkgpath origin_regexp
        pkgname=$1
        dstdir=$2
        rm -rf "${TMPDIR}"/package.tmp
@@ -834,6 +858,9 @@ pkgsys_create_backup_pkg ()
                message_echo "WARNING: Failed to create backup package for $pkgname." >&2
                return 1
        fi
+       dbpath=${DBDIR}/requires/$origin
+       [ -d "$dbpath" ] || dbpath=${DBDIR}/initial/$origin
+       pkg_info_qL > $dbpath/previously_installed_files
        [ -d "$dstdir" ] || mkdir -p "$dstdir"
        mv "${TMPDIR}/package.tmp/$backup_pkg" "$dstdir"
        pkgpath=$dstdir/$backup_pkg
@@ -873,7 +900,7 @@ pkgsys_delete_backup_pkg ()
 # ============= Get an existing package archive path for a port origin =============
 pkgsys_get_backup_pkg ()
 {
-       local origin origin_regexp
+       local origin tmpnewest origin_regexp
        origin=$1
        tmpnewest=${TMPDIR}/pkgsys_get_backup_pkg::newest
        origin_regexp=`str_escape_regexp "$origin"`
@@ -889,6 +916,16 @@ pkgsys_get_backup_pkg ()
        cat "$tmpnewest" 2> /dev/null
 }
 
+# ============= Get a file list to be restored by the current backup package for a port origin =============
+pkgsys_get_restored_files_by_backup_pkg ()
+{
+       local origin dbpath
+       origin=$1
+       dbpath=${DBDIR}/requires/$origin
+       [ -d "$dbpath" ] || dbpath=${DBDIR}/initial/$origin
+       cat "$dbpath/previously_installed_files" 2> /dev/null || :
+}
+
 # ============= Get a package name from a package archive file name =============
 pkgsys_pkgarc_to_pkgname ()
 {
@@ -1029,15 +1066,13 @@ pkgsys_sanitychk_pkgcontents ()
        _is_reinstall_encouraged=no
        while [ $iline -le $nlines ]
        do
-               src=`sed -n ${iline}p "$tmp_sanity"`
+               filename=`sed -n ${iline}p "$tmp_sanity"`
                iline=$(($iline+1))
-               filename=`echo "$src" | cut -d ' ' -f 1`
-               icol=2
-               until [ -e "$filename" -o "$filename" = "$src" ]
-               do
-                       filename="$filename "`echo "$src" | cut -d ' ' -f $icol`
-               done
-               [ -e "$filename" ] || continue
+               if [ ! -e "$filename" ]
+               then
+                       _is_reinstall_encouraged=yes
+                       break
+               fi
                if expr "$filename" : '.*/include/.*' > /dev/null
                then
                        _is_reinstall_encouraged=yes