OSDN Git Service

A small bug in the final message in case failed ports exixts is fixed.
authorMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Tue, 22 Jan 2013 18:11:53 +0000 (03:11 +0900)
committerMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Tue, 22 Jan 2013 18:11:53 +0000 (03:11 +0900)
modified:   portsreinstall

portsreinstall

index d04474f..c9ebe4b 100755 (executable)
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.2.2+toward_2.2.3_20130119230628
+MYVERSION=2.2.2+toward_2.2.3_20130123022306
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -141,7 +141,7 @@ do
        fi
 done
 
-if [ $help_mode -ne 0 ]
+if [ $help_mode -eq 0 ]
 then
 #      if [ $# -gt 0 ]
 #      then
@@ -2348,7 +2348,7 @@ then
                                backup_pkg=`create_backup_pkg "$currentpkg" "${DBDIR}/backup_obsolete"` || :
                                if [ -n "$backup_pkg" ]
                                then
-                                       echo "$backup_pkg" > ${DBDIR}/requires/$origin/backedup_pkgfile
+                                       echo "INFO: The backup is saved at $backup_pkg"
                                else
                                        echo "*** Continuating forcibly by keeping the installed package"
                                        continue
@@ -2814,7 +2814,7 @@ then
                record_success $origin
                [ -e "${DBDIR}/requires/$origin/failed_requirements" ] && cp "${DBDIR}/requires/$origin/failed_requirements" "${DBDIR}/requires/$origin/failed_requirements.previous"
                rm_a_line "$origin" "${DBDIR}/reinst_todo.list"
-               backup_pkg=`cat "${DBDIR}/requires/$origin/backedup_pkgfile" || :`
+               backup_pkg=`cat "${DBDIR}/requires/$origin/backedup_pkgfile" 2> /dev/null|| :`
                [ -n "$backup_pkg" -a -e "$backup_pkg" ] && rm -f "$backup_pkg"
                rm "${DBDIR}/requires/$origin/status/in_install"
                _MSG_CURRENT_STAGE=${_MSG_CURRENT_STAGE_general}
@@ -2872,7 +2872,7 @@ execute
 and restart by
         ${APPNAME} redo
 ****************
-       show_list_failure
+`show_list_failure`
 *** Warned by ${APPNAME}
 
 eof