[Python-modules-commits] [epsilon] 07/15: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository epsilon.

commit 92318add7717744e554bf6149277df8d092d4be6
Merge: 402f3e5 2569a96
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Oct 10 16:54:32 2015 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...ully-handle-not-finding-working-directory.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 epsilon/scripts/benchmark.py                       |  4 ++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index e6c12bb,0000000..329b162
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 910d0b771c11ee8f7cdf229eaf5d4c478cf19976
- 910d0b771c11ee8f7cdf229eaf5d4c478cf19976
++2569a96a45b18c134991a8e2166dadbe7c432e84
++2569a96a45b18c134991a8e2166dadbe7c432e84
 +910d0b771c11ee8f7cdf229eaf5d4c478cf19976
 +910d0b771c11ee8f7cdf229eaf5d4c478cf19976
 +epsilon_0.7.1.orig.tar.gz
 +162e83031a29a8c4f705fe5cb02988717c35d8ba
 +96820
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Gracefully-handle-not-finding-working-directory.patch
index 0000000,0000000..7f5a05e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Gracefully-handle-not-finding-working-directory.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 2569a96a45b18c134991a8e2166dadbe7c432e84 Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at debian.org>
++Date: Sat, 10 Oct 2015 16:52:24 +0200
++Subject: Gracefully handle not finding working directory.
++
++There are various situations where epsilon.benchmark may be unable to
++find the working directory in /proc/self/mounts; this patch makes the
++code handle this gracefully, like the case where the device cannot be
++found in /proc/diskstats.
++
++Forwarded: no
++---
++ epsilon/scripts/benchmark.py | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/epsilon/scripts/benchmark.py b/epsilon/scripts/benchmark.py
++index ae5f4aa..a30f53b 100644
++--- a/epsilon/scripts/benchmark.py
+++++ b/epsilon/scripts/benchmark.py
++@@ -428,7 +428,9 @@ def discoverCurrentWorkingDevice():
++         if cwd.startswith(parts[1]):
++             possibilities.append((len(parts[1]), parts[0]))
++     possibilities.sort()
++-    return possibilities[-1][-1]
+++    if len(possibilities) > 0:
+++        return possibilities[-1][-1]
+++    return ''
++ 
++ 
++ 
diff --cc debian/patches/series
index 0000000,0000000..8ca0031
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Gracefully-handle-not-finding-working-directory.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/epsilon.git