getnikola · Oct 18, 2016 · Oct 18, 2016
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,8 @@ New in master
 Bugfixes
 --------
 
+* Don't crash if plugins is a file (Issue #2539)
+
 Features
 --------
 

diff --git a/nikola/__main__.py b/nikola/__main__.py
@@ -155,7 +155,7 @@ def main(args=None):
             req_missing(['freezegun'], 'perform invariant builds')
 
     if config:
-        if os.path.exists('plugins') and not os.path.exists('plugins/__init__.py'):
+        if os.path.isdir('plugins') and not os.path.exists('plugins/__init__.py'):
             with open('plugins/__init__.py', 'w') as fh:
                 fh.write('# Plugin modules go here.')
 

diff --git a/snapcraft/edge/nikola.sh → snapcraft/edge/script/nikola.sh b/snapcraft/edge/nikola.sh → snapcraft/edge/script/nikola.sh
diff --git a/snapcraft/edge/snapcraft.yaml b/snapcraft/edge/snapcraft.yaml
@@ -11,11 +11,10 @@ apps:
 
 parts:
     nikola:
-        plugin: copy
-        files:
-            nikola.sh: nikola.sh
+        plugin: dump
+        source: script/
     nikola-source:
-        plugin: python3
+        plugin: python
         source: git://github.com/getnikola/nikola.git
         requirements: requirements.txt
         stage-packages:

diff --git a/snapcraft/requirements.txt b/snapcraft/requirements.txt
@@ -25,3 +25,6 @@ natsort>=3.5.2
 requests>=2.2.0
 husl>=4.0.2
 piexif>=1.0.3
+phpserialize==1.3
+webassets==0.11.1
+
diff --git a/snapcraft/stable/nikola.sh → snapcraft/stable/script/nikola.sh b/snapcraft/stable/nikola.sh → snapcraft/stable/script/nikola.sh
diff --git a/snapcraft/stable/snapcraft.yaml b/snapcraft/stable/snapcraft.yaml
@@ -11,11 +11,10 @@ apps:
 
 parts:
     nikola:
-        plugin: copy
-        files:
-            nikola.sh: nikola.sh
+        plugin: dump
+        source: script/
     nikola-source:
-        plugin: python3
+        plugin: python
         source: git://github.com/getnikola/nikola.git
         source-tag: v7.8.1
         requirements: requirements.txt