diff options
Diffstat (limited to 'media-gfx/hydrus/files')
-rw-r--r-- | media-gfx/hydrus/files/test-exitcode.patch | 36 | ||||
-rw-r--r-- | media-gfx/hydrus/files/upnpc.patch | 40 |
2 files changed, 0 insertions, 76 deletions
diff --git a/media-gfx/hydrus/files/test-exitcode.patch b/media-gfx/hydrus/files/test-exitcode.patch deleted file mode 100644 index d61d341ee1ef..000000000000 --- a/media-gfx/hydrus/files/test-exitcode.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/hydrus/hydrus_test.py b/hydrus/hydrus_test.py -index 3504c9c..7f95af8 100644 ---- a/hydrus/hydrus_test.py -+++ b/hydrus/hydrus_test.py -@@ -91,6 +91,9 @@ def boot(): - if sys.stdin.isatty(): - - input( 'Press any key to exit.' ) -+ else: - -+ success = 0 if controller.was_successful else 1 -+ sys.exit(success) - - -diff --git a/hydrus/test/TestController.py b/hydrus/test/TestController.py -index 0c43440..7e6c5ef 100644 ---- a/hydrus/test/TestController.py -+++ b/hydrus/test/TestController.py -@@ -168,7 +168,6 @@ only_run = None - class Controller( object ): - - def __init__( self, win, only_run ): -- - self.app = win - self.win = win - self.only_run = only_run -@@ -827,8 +826,7 @@ class Controller( object ): - def do_it(): - - try: -- -- runner.run( suite ) -+ self.was_successful = runner.run( suite ).wasSuccessful() - - finally: - diff --git a/media-gfx/hydrus/files/upnpc.patch b/media-gfx/hydrus/files/upnpc.patch deleted file mode 100644 index ea78f2b70b63..000000000000 --- a/media-gfx/hydrus/files/upnpc.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/hydrus/core/networking/HydrusNATPunch.py b/hydrus/core/networking/HydrusNATPunch.py -index c959753..6792d89 100644 ---- a/hydrus/core/networking/HydrusNATPunch.py -+++ b/hydrus/core/networking/HydrusNATPunch.py -@@ -3,6 +3,7 @@ import socket - import subprocess - import threading - import traceback -+import shutil - - from hydrus.core import HydrusConstants as HC - from hydrus.core import HydrusData -@@ -18,7 +19,7 @@ if HC.PLATFORM_WINDOWS: - - else: - -- possible_bin_filenames = [ 'upnpc-static', 'upnpc-shared', 'miniupnpc' ] -+ possible_bin_filenames = [ 'upnpc', 'upnpc-static', 'upnpc-shared', 'miniupnpc' ] - - if HC.PLATFORM_LINUX: - -@@ -42,7 +43,17 @@ for filename in possible_bin_filenames: - - UPNPC_PATH = possible_path - -- -+ break -+ -+ maybe_in_path = shutil.which( filename ) -+ -+ if maybe_in_path: -+ -+ UPNPC_PATH = maybe_in_path -+ -+ break -+ -+ - EXTERNAL_IP = {} - EXTERNAL_IP[ 'ip' ] = None - EXTERNAL_IP[ 'time' ] = 0 |