[GNUnet-SVN] [taler-merchant] branch master updated: NOT using setuptools' "scripts" keyword as it failed to set execution permissions on deployed files

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new c423101  NOT using setuptools' "scripts" keyword as it failed to set 
execution permissions on deployed files
c423101 is described below

commit c4231013e5759cfd0490eb8e6ec1abee768a98c5
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Apr 28 11:47:37 2017 +0200

    NOT using setuptools' "scripts" keyword as it
    failed to set execution permissions on deployed files
---
 .gitignore                      | 1 +
 src/mitm/Makefile.in            | 6 ++----
 src/mitm/setup.py               | 1 -
 src/mitm/taler-merchant-mitm.in | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6982c64..4cab3d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 *Makefile.in
+!src/mitm/*.in
 *Makefile
 aclocal.m4
 autom4te.cache
diff --git a/src/mitm/Makefile.in b/src/mitm/Makefile.in
index 5a845a1..1f46325 100644
--- a/src/mitm/Makefile.in
+++ b/src/mitm/Makefile.in
@@ -1,15 +1,13 @@
-INSTALL = install -m 644 -Dt
 
 .PHONY: all
 all:
        true
 
-
 .PHONY: install-data
 install-data:
-       $(INSTALL) @prefix@/share/taler/ merchant-mitm.wsgi
+       install -m 444 -Dt @prefix@/share/taler/ merchant-mitm.wsgi
 
 .PHONY: install
 install: install-data
-       $(INSTALL) @prefix@/bin/ taler-merchant-mitm
        pip3 install . --install-option="address@hidden@"
+       install -m 544 -Dt @prefix@/bin taler-merchant-mitm
diff --git a/src/mitm/setup.py b/src/mitm/setup.py
index 9025592..f5eedea 100644
--- a/src/mitm/setup.py
+++ b/src/mitm/setup.py
@@ -8,5 +8,4 @@ setup(name='talermerchantmitm',
       license='GPL',
       packages=find_packages(),
       install_requires=["Flask>=0.10"],
-      scripts=['taler-merchant-mitm'],
       zip_safe=False)
diff --git a/src/mitm/taler-merchant-mitm.in b/src/mitm/taler-merchant-mitm.in
index 9f60172..39a7275 100644
--- a/src/mitm/taler-merchant-mitm.in
+++ b/src/mitm/taler-merchant-mitm.in
@@ -36,6 +36,7 @@ if getattr(args, 'exchange_url', None) is None:
 
 uwsgi_logfmt = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
 
+os.environ["TALER_EXCHANGE_URL"] = args.exchange_url
 os.execlp("uwsgi", "uwsgi",
             "--master",
             "--die-on-term",

-- 
To stop receiving notification emails like this one, please contact
address@hidden