mirror of
https://github.com/haiwen/seafile-server.git
synced 2025-09-10 19:59:18 +00:00
Get dot from the end of the string (#757)
* Get dot from the end of the string * Upgrade ci python --------- Co-authored-by: Heran Yang <heran.yang@seafile.com>
This commit is contained in:
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -12,7 +12,7 @@ jobs:
|
||||
fetch-depth: 1
|
||||
- uses: actions/setup-python@v1
|
||||
with:
|
||||
python-version: "3.12.9"
|
||||
python-version: "3.12.10"
|
||||
- name: install dependencies and test
|
||||
run: |
|
||||
cd $GITHUB_WORKSPACE
|
||||
|
@@ -54,7 +54,7 @@ def make_build_env():
|
||||
|
||||
_env_add('PATH', join(PREFIX, 'bin'))
|
||||
if on_github_actions():
|
||||
_env_add('PYTHONPATH', join(os.environ.get('RUNNER_TOOL_CACHE'), 'Python/3.12.9/x64/lib/python3.12/site-packages'))
|
||||
_env_add('PYTHONPATH', join(os.environ.get('RUNNER_TOOL_CACHE'), 'Python/3.12.10/x64/lib/python3.12/site-packages'))
|
||||
_env_add('PYTHONPATH', join(PREFIX, 'lib/python3.12/site-packages'))
|
||||
_env_add('PKG_CONFIG_PATH', join(PREFIX, 'lib', 'pkgconfig'))
|
||||
_env_add('PKG_CONFIG_PATH', join(PREFIX, 'lib64', 'pkgconfig'))
|
||||
|
@@ -932,7 +932,7 @@ func genUniqueFileName(fileName string, fileList []string) string {
|
||||
var uniqueName string
|
||||
var name string
|
||||
i := 1
|
||||
dot := strings.Index(fileName, ".")
|
||||
dot := strings.LastIndex(fileName, ".")
|
||||
if dot < 0 {
|
||||
name = fileName
|
||||
} else {
|
||||
@@ -2334,7 +2334,7 @@ func genUniqueName(fileName string, entries []*fsmgr.SeafDirent) string {
|
||||
var uniqueName string
|
||||
var name string
|
||||
i := 1
|
||||
dot := strings.Index(fileName, ".")
|
||||
dot := strings.LastIndex(fileName, ".")
|
||||
if dot < 0 {
|
||||
name = fileName
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user