d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcupdate: Don't rotate trees for a dry run.

Browse Source 
When performing a dry run, remove the temporary tree created rather
than rotating the trees.  Rotating the trees meant that etcupdate
thought the latest changes were already merged and would not merge
them on the next real run.

PR:		260281
Reported by:	Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
Fixes:		0611aec3cf3a etcupdate: Always extract to a temporary tree.
MFC after:	1 week
This commit is contained in:
John Baldwin 2022-05-25 14:02:51 -07:00
parent 4682ac697c
commit 431944fb5f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/etcupdate/etcupdate.sh
View File

@ -1612,6 +1612,18 @@ EOF
cat $WARNINGS
fi
# If this was a dryrun, remove the temporary tree if we built
# a new one.
if [ -n "$dryrun" ]; then
if [ -n "$dir" ]; then
if [ -n "$rerun" ]; then
panic "Should not have a temporary directory"
fi
remove_tree $dir
fi
return
fi
# Finally, rotate any needed trees.
if [ "$new" != "$NEWTREE" ]; then
if [ -n "$rerun" ]; then