| 1 |
blueness 12/06/02 15:46:37 |
| 2 |
|
| 3 |
Added: tribler-5.9.12-remove-garbage.patch |
| 4 |
tribler-5.9.12-fix-global-declarations.patch |
| 5 |
Log: |
| 6 |
Version bump, bug #419163 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-p2p/tribler/files/tribler-5.9.12-remove-garbage.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/tribler/files/tribler-5.9.12-remove-garbage.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/tribler/files/tribler-5.9.12-remove-garbage.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: tribler-5.9.12-remove-garbage.patch |
| 17 |
=================================================================== |
| 18 |
diff -ur usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py |
| 19 |
--- usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py 2012-06-01 12:25:28.000000000 +0200 |
| 20 |
+++ usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py 2012-06-02 00:32:09.656471960 +0200 |
| 21 |
@@ -41,7 +41,7 @@ |
| 22 |
|
| 23 |
exp_obj = ExpObj() |
| 24 |
|
| 25 |
- exp_obj.reg_status_of_node(msg.src_node, STATUS_ON_PROCESS) |
| 26 |
+ exp_obj.reg_status_of_node(msg.src_node, STATUS_ON_PROCESS) |
| 27 |
|
| 28 |
|
| 29 |
log_distance = exp_obj.next_log_dist() |
| 30 |
diff -ur usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py |
| 31 |
--- usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py 2012-06-01 12:25:28.000000000 +0200 |
| 32 |
+++ usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py 2012-06-02 00:35:34.163153478 +0200 |
| 33 |
@@ -106,10 +106,7 @@ |
| 34 |
queries_to_send = [self._get_maintenance_query(node_)] |
| 35 |
# This task did do some work. We are done here! |
| 36 |
break |
| 37 |
-<<<<<<< HEAD |
| 38 |
-======= |
| 39 |
# print 'nice', _MAINTENANCE_DELAY[self._maintenance_mode] |
| 40 |
->>>>>>> d7bed531d0bbfa54c481422b96243221bf18e2ff |
| 41 |
return (_MAINTENANCE_DELAY[self._maintenance_mode], |
| 42 |
queries_to_send, maintenance_lookup_target) |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 net-p2p/tribler/files/tribler-5.9.12-fix-global-declarations.patch |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/tribler/files/tribler-5.9.12-fix-global-declarations.patch?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/tribler/files/tribler-5.9.12-fix-global-declarations.patch?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: tribler-5.9.12-fix-global-declarations.patch |
| 53 |
=================================================================== |
| 54 |
diff -Naur usr.orig/share/tribler/Tribler/Player/swarmplayer.py usr/share/tribler/Tribler/Player/swarmplayer.py |
| 55 |
--- usr.orig/share/tribler/Tribler/Player/swarmplayer.py 2012-02-11 11:54:10.000000000 -0500 |
| 56 |
+++ usr/share/tribler/Tribler/Player/swarmplayer.py 2012-02-11 11:53:15.000000000 -0500 |
| 57 |
@@ -438,9 +438,9 @@ |
| 58 |
|
| 59 |
s_play = status.get_or_create_status_element("playable", False) |
| 60 |
if playable: |
| 61 |
+ global START_TIME |
| 62 |
if preprogress < 1.0: |
| 63 |
if s_play.get_value() == True: |
| 64 |
- global START_TIME |
| 65 |
status.create_and_add_event("failed_after", [time.time() - START_TIME]) |
| 66 |
START_TIME = time.time() |
| 67 |
|
| 68 |
@@ -448,7 +448,6 @@ |
| 69 |
|
| 70 |
elif s_play.get_value() == False: |
| 71 |
s_play.set_value(True) |
| 72 |
- global START_TIME |
| 73 |
status.create_and_add_event("playable_in", [time.time() - START_TIME]) |
| 74 |
START_TIME = time.time() |
Archives