mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Merge branch 'as_posix' into 'master'
use .as_posix() to convert to posix path str See merge request fdroid/fdroidserver!946
This commit is contained in:
commit
a946ae2b44
@ -25,7 +25,7 @@ import sys
|
||||
import yaml
|
||||
from argparse import ArgumentParser
|
||||
import logging
|
||||
from pathlib import Path, PurePosixPath
|
||||
from pathlib import Path
|
||||
|
||||
try:
|
||||
from yaml import CSafeLoader as SafeLoader
|
||||
@ -192,7 +192,7 @@ def main():
|
||||
build.subdir = options.subdir
|
||||
build.gradle = ['yes']
|
||||
elif subdir:
|
||||
build.subdir = str(PurePosixPath(subdir))
|
||||
build.subdir = subdir.as_posix()
|
||||
build.gradle = ['yes']
|
||||
|
||||
if options.license:
|
||||
|
@ -19,7 +19,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import git
|
||||
from pathlib import Path, PurePosixPath
|
||||
from pathlib import Path
|
||||
import platform
|
||||
import re
|
||||
import logging
|
||||
@ -734,7 +734,7 @@ def parse_metadata(metadatapath):
|
||||
"""
|
||||
metadatapath = Path(metadatapath)
|
||||
app = App()
|
||||
app.metadatapath = str(PurePosixPath(metadatapath))
|
||||
app.metadatapath = metadatapath.as_posix()
|
||||
name = metadatapath.stem
|
||||
if name != '.fdroid':
|
||||
app.id = name
|
||||
|
Loading…
Reference in New Issue
Block a user