YunoHost/package_check
1
0
Fork 0
mirror of https://github.com/YunoHost/package_check.git synced 2024-09-03 20:06:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

More hunting of unecessarily verbose message

Browse source
This commit is contained in:
Alexandre Aubin 2020-11-29 21:28:20 +01:00
parent 5fa78d5de0
commit e7f5e34a8b
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sub_scripts/launcher.sh
View file

@ -317,7 +317,7 @@ LXC_STOP () {
start_timer start_timer
# Stop the LXC container # Stop the LXC container
if is_lxc_running; then if is_lxc_running; then
echo "Stop the LXC container" | tee --append "$test_result" echo "Stop the LXC container" >> "$test_result"
sudo lxc-stop --name=$lxc_name | tee --append "$test_result" 2>&1 sudo lxc-stop --name=$lxc_name | tee --append "$test_result" 2>&1
fi fi
@ -337,7 +337,7 @@ LXC_STOP () {
fi fi
# Restore the snapshot. # Restore the snapshot.
echo "Restore the previous snapshot." | tee --append "$test_result" echo "Restore the previous snapshot." >> "$test_result"
sudo rsync --acls --archive --delete --executability --itemize-changes --xattrs "$snapshot_path/$current_snapshot/rootfs/" "/var/lib/lxc/$lxc_name/rootfs/" > /dev/null 2>> "$test_result" sudo rsync --acls --archive --delete --executability --itemize-changes --xattrs "$snapshot_path/$current_snapshot/rootfs/" "/var/lib/lxc/$lxc_name/rootfs/" > /dev/null 2>> "$test_result"
stop_timer 1 >> "$complete_log" stop_timer 1 >> "$complete_log"
} }

14
sub_scripts/testing_process.sh
View file

@ -818,7 +818,7 @@ CHECK_UPGRADE () {
# Uses the default snapshot # Uses the default snapshot
current_snapshot=snap0 current_snapshot=snap0
# Stop and restore the LXC container # Stop and restore the LXC container
LXC_STOP LXC_STOP >> $complete_log
done 4< "$script_dir/upgrade_list" done 4< "$script_dir/upgrade_list"
} }
@ -942,7 +942,7 @@ CHECK_PUBLIC_PRIVATE () {
break_before_continue break_before_continue
# Stop and restore the LXC container # Stop and restore the LXC container
LXC_STOP LXC_STOP >> $complete_log
done done
} }
@ -1285,7 +1285,7 @@ CHECK_BACKUP_RESTORE () {
sudo mv -f ./archives /var/lib/lxcsnaps/$lxc_name/$current_snapshot/rootfs/home/yunohost.backup/ sudo mv -f ./archives /var/lib/lxcsnaps/$lxc_name/$current_snapshot/rootfs/home/yunohost.backup/
# Stop and restore the LXC container # Stop and restore the LXC container
LXC_STOP LXC_STOP >> $complete_log
ECHO_FORMAT "\nRestore on a clean YunoHost system...\n" "white" "bold" clog ECHO_FORMAT "\nRestore on a clean YunoHost system...\n" "white" "bold" clog
fi fi
@ -1328,7 +1328,7 @@ CHECK_BACKUP_RESTORE () {
break_before_continue break_before_continue
# Stop and restore the LXC container # Stop and restore the LXC container
LXC_STOP LXC_STOP >> $complete_log
done done
done done
} }
@ -1488,7 +1488,7 @@ CHECK_CHANGE_URL () {
# Uses the default snapshot # Uses the default snapshot
current_snapshot=snap0 current_snapshot=snap0
# Stop and restore the LXC container # Stop and restore the LXC container
LXC_STOP LXC_STOP >> $complete_log
done done
} }
@ -1806,7 +1806,7 @@ ACTIONS_CONFIG_PANEL () {
# Uses the default snapshot # Uses the default snapshot
current_snapshot=snap0 current_snapshot=snap0
# Stop and restore the LXC container # Stop and restore the LXC container
LXC_STOP LXC_STOP >> $complete_log
} }
PACKAGE_LINTER () { PACKAGE_LINTER () {
@ -1875,7 +1875,7 @@ TEST_LAUNCHER () {
current_snapshot=snap0 current_snapshot=snap0
# Stop and restore the LXC container # Stop and restore the LXC container
LXC_STOP LXC_STOP >> $complete_log
# Restore the started time for the timer # Restore the started time for the timer
starttime=$global_start_timer starttime=$global_start_timer