[Git][reproducible-builds/diffoscope][master] 3 commits: Fix execution of symbolic links that point to the "bin/diffoscope" entry point...

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
afc63b31 by Chris Lamb at 2019-05-09T16:28:17Z
Fix execution of symbolic links that point to the "bin/diffoscope" entry point by fully resolving the location as part of dynamically calculating Python's include path.

- - - - -
2c373971 by Chris Lamb at 2019-05-17T09:19:26Z
Add a Dockerfile.

- - - - -
ba4b2ae3 by Chris Lamb at 2019-05-17T09:21:55Z
Update contributing messages to reflect Docker image.

- - - - -


3 changed files:

- CONTRIBUTING.rst
- + Dockerfile
- bin/diffoscope


Changes:

=====================================
CONTRIBUTING.rst
=====================================
@@ -63,3 +63,7 @@ Once the tracker.debian.org entry appears, consider tweeting the release on
 
   %twitter diffoscope $VERSION has been released. Check out the changelog here: $URL
 
+Once the new version lands in the Debian archive, please update the Docker image using::
+
+    docker build -t registry.salsa.debian.org/reproducible-builds/diffoscope .
+    docker push registry.salsa.debian.org/reproducible-builds/diffoscope


=====================================
Dockerfile
=====================================
@@ -0,0 +1,10 @@
+FROM debian:sid
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN echo deb http://deb.debian.org/debian experimental main >> /etc/apt/sources.list
+
+RUN apt-get update && apt-get dist-upgrade --yes
+RUN apt-get install --yes --install-recommends --target-release=experimental diffoscope || apt-get install --yes --install-recommends diffoscope
+
+ENTRYPOINT /usr/bin/diffoscope


=====================================
bin/diffoscope
=====================================
@@ -26,7 +26,7 @@ import sys
 # Prefer local modules over any system-installed ones to ensure that running a
 # Git version from any current working directory does not have unexpected
 # behaviour.
-parent = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+parent = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 if os.path.exists(os.path.join(parent, 'diffoscope', '__init__.py')):
     sys.path.insert(0, parent)
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/ea2bec4a8a9c7b144c2320978f27e5707b6e71f4...ba4b2ae34f799bfa6af2d8f3a28b9db3a54fc208

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/ea2bec4a8a9c7b144c2320978f27e5707b6e71f4...ba4b2ae34f799bfa6af2d8f3a28b9db3a54fc208
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190517/ab8da381/attachment.html>