From d59238461b54b5f788b72d8a85e0dc25e8774f5c Mon Sep 17 00:00:00 2001 From: ngld Date: Tue, 28 Nov 2017 22:28:10 +0100 Subject: [PATCH 1/4] Switch to the next version. --- knossos/center.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knossos/center.py b/knossos/center.py index 6afbb5df..420a9a07 100644 --- a/knossos/center.py +++ b/knossos/center.py @@ -24,7 +24,7 @@ # The version should follow the http://semver.org guidelines. # Only remove the -dev tag if you're making a release! -VERSION = '0.7.0-dev' +VERSION = '0.8.0-dev' UPDATE_LINK = 'https://dev.tproxy.de/knossos' INNOEXTRACT_LINK = 'https://dev.tproxy.de/knossos/innoextract.txt' DEBUG = os.getenv('KN_DEBUG', '0').strip() == '1' From 80c4a33c387bda72187eb03d4b8f391145c7d3db Mon Sep 17 00:00:00 2001 From: ngld Date: Tue, 28 Nov 2017 23:21:29 +0100 Subject: [PATCH 2/4] Fix ubuntu and pypi build scripts --- releng/pypi/auto-build.sh | 6 ++++-- releng/ubuntu/auto-build.sh | 6 +++++- releng/ubuntu/build.sh | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/releng/pypi/auto-build.sh b/releng/pypi/auto-build.sh index dd97c9e2..d1c13a41 100644 --- a/releng/pypi/auto-build.sh +++ b/releng/pypi/auto-build.sh @@ -4,12 +4,14 @@ set -eo pipefail cd /build sudo chown packager . -rsync -a --exclude=dist --exclude=build --exclude=packer --exclude=.vagrant src/ work/ -cd work +rsync -a --exclude=releng --exclude=node_modules src/ work/ +cd src . releng/config/config.sh import_key +cd ../work + export QT_SELECT=5 VERSION="$(python3 setup.py get_version)" diff --git a/releng/ubuntu/auto-build.sh b/releng/ubuntu/auto-build.sh index fcd84b8f..5e31b620 100644 --- a/releng/ubuntu/auto-build.sh +++ b/releng/ubuntu/auto-build.sh @@ -23,7 +23,9 @@ fi cd ../../../../work export QT_SELECT=5 -VERSION="$(python3 setup.py get_version)" +if [ -z "$VERSION" ]; then + VERSION="$(python3 setup.py get_version)" +fi UBUNTU_VERSION="artful" rsync -au ../src/releng/ubuntu/cache/node_modules/ node_modules/ @@ -39,7 +41,9 @@ tar -xzf ../"knossos_$VERSION.orig.tar.gz" cp -a ../src/releng/ubuntu/debian . if [ "$RELEASE" = "y" ]; then + pushd /build/src > /dev/null import_key + popd > /dev/null for ubuntu in $UBUNTU_VERSIONS; do cat > debian/changelog < Date: Wed, 29 Nov 2017 00:41:45 +0100 Subject: [PATCH 3/4] Fix duplicated downloads by actually checking installed mods. --- knossos/tasks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/knossos/tasks.py b/knossos/tasks.py index 34d62250..4fff0572 100644 --- a/knossos/tasks.py +++ b/knossos/tasks.py @@ -377,12 +377,13 @@ def work1(self, mod): os.makedirs(modpath) amount = float(len(mfiles)) - inst_mods = center.installed.query_all(mod.mid) copies = [] pkg_folders = {} # query_all is a generator so the exception will be thrown when looping over the result try: + inst_mods = list(center.installed.query_all(mod.mid)) + for mv in inst_mods: if mv.dev_mode: pf = pkg_folders.setdefault(mv, {}) From 1eb32a1f5f8f00d73d465a732ec5b014bcbc000b Mon Sep 17 00:00:00 2001 From: ngld Date: Wed, 29 Nov 2017 00:56:51 +0100 Subject: [PATCH 4/4] Show the correct tab on startup and save a base path change correctly --- html/templates/kn-page.vue | 5 +++++ html/templates/kn-settings-page.vue | 6 +++++- knossos/windows.py | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/html/templates/kn-page.vue b/html/templates/kn-page.vue index f1eec44d..7b311e40 100644 --- a/html/templates/kn-page.vue +++ b/html/templates/kn-page.vue @@ -1,5 +1,6 @@