Show More
@@ -0,0 +1,20 b'' | |||||
|
1 | diff -rup Beaker-1.9.1-orig/beaker/container.py Beaker-1.9.1/beaker/container.py | |||
|
2 | --- Beaker-1.9.1-orig/beaker/container.py 2018-04-10 10:23:04.000000000 +0200 | |||
|
3 | +++ Beaker-1.9.1/beaker/container.py 2018-04-10 10:23:34.000000000 +0200 | |||
|
4 | @@ -353,13 +353,13 @@ class Value(object): | |||
|
5 | debug("get_value returning old value while new one is created") | |||
|
6 | return value | |||
|
7 | else: | |||
|
8 | - debug("lock_creatfunc (didnt wait)") | |||
|
9 | + debug("lock_creatfunc `%s` (didnt wait)", self.createfunc.__name__) | |||
|
10 | has_createlock = True | |||
|
11 | ||||
|
12 | if not has_createlock: | |||
|
13 | - debug("lock_createfunc (waiting)") | |||
|
14 | + debug("lock_createfunc `%s` (waiting)", self.createfunc.__name__) | |||
|
15 | creation_lock.acquire() | |||
|
16 | - debug("lock_createfunc (waited)") | |||
|
17 | + debug("lock_createfunc `%s` (waited)", self.createfunc.__name__) | |||
|
18 | ||||
|
19 | try: | |||
|
20 | # see if someone created the value already |
@@ -12,6 +12,12 b' in' | |||||
12 |
|
12 | |||
13 | self: super: { |
|
13 | self: super: { | |
14 |
|
14 | |||
|
15 | Beaker = super.Beaker.override (attrs: { | |||
|
16 | patches = [ | |||
|
17 | ./patch-beaker-lock-func-debug.diff | |||
|
18 | ]; | |||
|
19 | }); | |||
|
20 | ||||
15 | subvertpy = super.subvertpy.override (attrs: { |
|
21 | subvertpy = super.subvertpy.override (attrs: { | |
16 | # TODO: johbo: Remove the "or" once we drop 16.03 support |
|
22 | # TODO: johbo: Remove the "or" once we drop 16.03 support | |
17 | SVN_PREFIX = "${pkgs.subversion.dev or pkgs.subversion}"; |
|
23 | SVN_PREFIX = "${pkgs.subversion.dev or pkgs.subversion}"; |
General Comments 0
You need to be logged in to leave comments.
Login now