[#2859] pastescript name conflict

ckan · Aug 20, 2012 · 512a17d · 512a17d
1 parent 127197a
commit 512a17d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/build.sh b/build.sh
@@ -73,6 +73,7 @@ buildkit pkg python -p $CKAN_PACKAGE_VERSION \
                     --conflict-module "repoze.who-friendlyform -> repoze" \
                     --conflict-module "repoze.who.plugins.openid -> repoze" \
                     --conflict-module "psycopg2 -> psycopg" \
+                    --conflict-module "pastescript -> paste" \
                     --debian-dir \
                     --url http://ckan.org \
                     --ubuntu-release "$UBUNTU_RELEASE" \