Skip to content

Commit 2fb304a

Browse files
authored
Merge pull request #4 from aros-development-team/master
Merge upstream
2 parents 831105b + 00bb556 commit 2fb304a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

scripts/azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fi
4141
sudo apt-key adv --keyserver packages.microsoft.com --recv-keys B02C46DF417A0893
4242
sudo apt-get update -y
43-
sudo apt-get upgrade -y
43+
sudo ACCEPT_EULA=Y apt-get upgrade -y
4444
sudo apt-get install -y libpng-dev zlib1g-dev libxcursor-dev libgl1-mesa-dev libasound2-dev
4545
sudo apt-get install -y gawk bison flex netpbm automake cmake genisoimage sshpass
4646
sudo apt-get install -y python-mako libswitch-perl gperf gcc-multilib g++ ccache

scripts/cpy-dir-rec.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ def copy_tree(src, dst, ignore):
3232
# directories like Locale/Help/Español on non-western systems, where locale
3333
# is different from Latin-1 (e. g. russian).
3434
# See http://docs.python.org/2/howto/unicode.html#unicode-filenames
35-
names = os.listdir(unicode(src))
35+
src_u = unicode(src, "utf-8").encode("utf-8")
36+
names = os.listdir(src_u)
3637

3738
if not os.path.exists(dst):
3839
os.makedirs(dst)

0 commit comments

Comments
 (0)