Hello!
Sorry that I am writing already again even the “Child returned 139” issue isn’t solved yet. But I thought that morning - okay let’s update again. First the Console showed that all the update went well but than I tried to start and a error occured. So I thought maybe something went wrong and I pushed again the Update bottom but now another Error occured:
- D:\WebODM Manager>cd WebODM/
- D:\WebODM Manager\WebODM>git pull origin master
- Stopping node-odm-1 …
- Stopping db …
- Stopping broker …
- From https://github.com/OpenDroneMap/WebODM
-
- branch master -> FETCH_HEAD
- e[3Ae[2K
- Stopping node-odm-1 … e[32mdonee[0m
- Updating 3714f43…a02b20a
- error: Your local changes to the following files would be overwritten by merge:
- Dockerfile
- README.md
- app/api/processingnodes.py
- app/api/tasks.py
- app/boot.py
- app/migrations/0001_initial.py
- app/models/preset.py
- app/models/project.py
- app/models/task.py
- app/plugins/signals.py
- app/static/app/css/theme.scss
- app/static/app/js/classes/AssetDownloads.js
- app/static/app/js/classes/plugins/API.js
- app/static/app/js/classes/plugins/ApiFactory.js
- app/static/app/js/classes/plugins/Dashboard.js
- app/static/app/js/components/BasicTaskView.jsx
- app/static/app/js/components/EditTaskForm.jsx
- app/static/app/js/components/Map.jsx
- app/static/app/js/components/NewTaskPanel.jsx
- app/static/app/js/components/ProjectListItem.jsx
- app/static/app/js/components/TaskListItem.jsx
- app/static/app/js/css/Map.scss
- app/static/app/js/main.jsx
- app/templates/app/processing_node.html
- app/tests/test_api.py
- app/tests/test_api_preset.py
- app/tests/test_api_task.py
- app/tests/test_app.py
- nodeodm/admin.py
- nodeodm/api_client.py
- nodeodm/migrations/0001_initial.py
- nodeodm/models.py
- package.json
- requirements.txt
- slate/source/includes/reference/_processingnode.md
- webodm/settings.py
- Please commit your changes or stash them before you merge.
- error: The following untracked working tree files would be overwritten by merge:
- app/migrations/0024_update_task_assets.py
- app/static/app/js/classes/TempLayer.js
- app/static/app/js/classes/plugins/App.js
- app/tests/test_gdal.py
- nodeodm/migrations/0005_auto_20190115_1346.py
- plugins/lightning/init.py
- plugins/lightning/manifest.json
- plugins/lightning/plugin.py
- plugins/lightning/public/CostEstimateItem.jsx
- plugins/lightning/public/CostEstimateItem.scss
- plugins/lightning/public/Dashboard.jsx
- plugins/lightning/public/Dashboard.scss
- plugins/lightning/public/Login.jsx
- plugins/lightning/public/Login.scss
- plugins/lightning/public/add_cost_estimate.js
- plugins/lightning/public/app.jsx
- plugins/lightning/public/app.scss
- plugins/lightning/templates/index.html
- Please move or remove them before you merge.
- Aborting
- D:\WebODM Manager\WebODM>docker-compose -f docker-compose.yml -f docker-compose.nodeodm.yml down --remove-orphans
- e[3Be[1Ae[2K
- Stopping broker … e[32mdonee[0m
- e[1Be[2Ae[2K
- Stopping db … e[32mdonee[0m
- e[2B
- Removing node-odm-1 …
- Removing db …
- Removing broker …
- e[3Ae[2K
- Removing node-odm-1 … e[32mdonee[0m
- e[3Be[1Ae[2K
- Removing broker … e[32mdonee[0m
- e[1Be[2Ae[2K
- Removing db … e[32mdonee[0m
- e[2BRemoving network webodm_default
- D:\WebODM Manager\WebODM>docker-compose -f docker-compose.yml -f docker-compose.nodeodm.yml pull
- Pulling db (opendronemap/webodm_db:latest)…
- Get https://registry-1.docker.io/v2/opendronemap/webodm_db/manifests/latest: Get https://auth.docker.io/token?scope=repository%3Aopendronemap%2Fwebodm_db%3Apull&service=registry.docker.io: dial tcp: lookup auth.docker.io on 10.0.2.3:53: read udp 10.0.2.15:33560->10.0.2.3:53: i/o timeout
- D:\WebODM Manager\WebODM>exit 1
- Error: Update exited with code: 1
Is this “only” a update problem or do I get deeper into a 1/0-Sh** by updateing a not proper working version?
Tnx for help,
Alex
