From 025ee1d77deaccd289b451f03201e7f13b4d1be4 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Sun, 24 Jan 2021 21:51:58 +0100
Subject: Resolve SNAP conflict

---
 snap/snapcraft.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'snap/snapcraft.yaml')

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 120c4130..0372ab3f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -60,11 +60,19 @@ parts:
     source: https://github.com/bottlepy/bottle.git
     source-branch: release-0.12
     source-depth: 1
+    override-build: |
+      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/bottle-dist
+    organize:
+      bottle-dist: bottle/dist
   docker:
     plugin: python
     source: https://github.com/docker/docker-py.git
     source-tag: '3.7.3'
     source-depth: 1
+    override-build: |
+      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/docker-dist
+    organize:
+      bottle-dist: docker/dist
   launchers:
     source: snap/local/launchers
     plugin: dump
-- 
cgit v1.2.3