syntax error near unexpected token `<<<' when running any sherpa command #328
Description
@OneCDOnly I hope you are keeping well .
Sherpa fails to run after an reboot. It looks like unresolved Git merge markers were written into sherpa-manager.sh. I rebooted the NAS between the previous and the last update to Sherpa.
Symptoms
Running any Sherpa command produces a syntax error.
Full session / error output
Shell session and log output
[admin@valinor dirk]# sherpa upgrade new
/share/CACHEDEV1_DATA/.qpkg/sherpa/cache/sherpa-manager.sh: line 5806: syntax error near unexpected token `<<<'
/share/CACHEDEV1_DATA/.qpkg/sherpa/cache/sherpa-manager.sh: line 5806: `<<<<<<<HEAD'
[admin@valinor dirk]# sherpa clean
/share/CACHEDEV1_DATA/.qpkg/sherpa/cache/sherpa-manager.sh: line 5806: syntax error near unexpected token `<<<'
/share/CACHEDEV1_DATA/.qpkg/sherpa/cache/sherpa-manager.sh: line 5806: `<<<<<<<HEAD'
[admin@valinor dirk]# sherpa clean
[admin@valinor dirk]# sed -n '5795,5820p' /share/CACHEDEV1_DATA/.qpkg/sherpa/cache/sherpa-manager.sh
fi
else
SaveActionResultMetrics QPKG "$qpkg_name" "$action" '' er "$z"
MarkActionForkAsDoneError
z=1
fi
fi
FuncForkExit $z;}
_QPKG:install_(){
FuncForkInit
local action=install
<<<<<<<HEAD
local local_pathfile=$(GetQpkgDbPathFilename)
local log_pathfile=$r_logs_path/$(/usr/bin/basename "$local_pathfile").$r_install_log_file
local -i pid=0
=======
local -r r_local_pathfile=$(GetQpkgDbPathFilename)
>>>>>>>unstable
local -i z=0
if IsQpkgInstalled;then
SaveActionResultMetrics QPKG "$qpkg_name" "$action" '' sk "already installed, please use 'reinstall' instead"
MarkActionForkAsSkippedOk
z=2
elif IsQpkgProhibited;then
SaveActionResultMetrics QPKG "$qpkg_name" "$action" '' sk 'prohibited package'
MarkActionForkAsSkippedOk
[admin@valinor dirk]#
Problem description
The sherpa-manager.sh file contains unresolved Git merge conflict markers around the _QPKG:install_() function:
<<<<<<<HEAD=======>>>>>>>unstable
Can you lend me a hand and sort this one out? :)
Metadata
Metadata
Assignees
Labels
No labels