[Python-apps-commits] r14428 - in packages/sabnzbdplus/trunk/debian/patches (3 files)

[jcfp-guest at users.alioth.debian.org]

    Date: Wednesday, October 18, 2017 @ 11:06:46
  Author: jcfp-guest
Revision: 14428

refresh patches for 2.3.1

Modified:
  packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
  packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
  packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff

Modified: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff	2017-10-18 10:41:20 UTC (rev 14427)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff	2017-10-18 11:06:46 UTC (rev 14428)
@@ -18,14 +18,14 @@
  import sabnzbd.par2file as par2file
 -import sabnzbd.utils.rarfile as rarfile
 +import rarfile
- from sabnzbd.encoding import unicoder, is_utf8
+ from sabnzbd.encoding import unicoder
  from sabnzbd.rating import Rating
  
 --- a/sabnzbd/directunpacker.py
 +++ b/sabnzbd/directunpacker.py
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
  from sabnzbd.encoding import TRANS, unicoder
- from sabnzbd.newsunpack import build_command, EXTRACTFROM_RE, rar_volumelist
+ from sabnzbd.newsunpack import build_command, EXTRACTFROM_RE, EXTRACTED_RE, rar_volumelist
  from sabnzbd.postproc import prepare_extraction_path
 -from sabnzbd.utils.rarfile import RarFile
 +from rarfile import RarFile
@@ -41,8 +41,8 @@
 -import sabnzbd.utils.rarfile as rarfile
 +import rarfile
  from sabnzbd.encoding import platform_encode
+ from sabnzbd.decorators import synchronized, NZBQUEUE_LOCK
  from sabnzbd.newsunpack import is_sevenfile, SevenZip
- import sabnzbd.nzbstuff as nzbstuff
 --- a/sabnzbd/newsunpack.py
 +++ b/sabnzbd/newsunpack.py
 @@ -30,7 +30,7 @@
@@ -53,10 +53,10 @@
 +import rarfile
  from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \
      real_path, globber, globber_full, get_all_passwords, renamer, clip_path, \
-     has_win_device, calc_age, long_path
+     has_win_device, calc_age, long_path, remove_file
 --- a/sabnzbd/postproc.py
 +++ b/sabnzbd/postproc.py
-@@ -49,7 +49,7 @@
+@@ -48,7 +48,7 @@
  import sabnzbd.nzbqueue
  import sabnzbd.database as database
  import sabnzbd.notifier as notifier

Modified: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff	2017-10-18 10:41:20 UTC (rev 14427)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff	2017-10-18 11:06:46 UTC (rev 14428)
@@ -1,7 +1,7 @@
 # Disable the builtin check for newer versions.
 --- a/sabnzbd/misc.py
 +++ b/sabnzbd/misc.py
-@@ -648,6 +648,8 @@
+@@ -647,6 +647,8 @@
          they are already using an alpha/beta/rc.
          RC's are valued higher than Beta's, which are valued higher than Alpha's.
      """

Modified: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff	2017-10-18 10:41:20 UTC (rev 14427)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff	2017-10-18 11:06:46 UTC (rev 14428)
@@ -19,7 +19,7 @@
                  <input type="hidden" name="session" value="$session" />
 --- a/sabnzbd/__init__.py
 +++ b/sabnzbd/__init__.py
-@@ -1164,6 +1164,8 @@
+@@ -1163,6 +1163,8 @@
          logging.debug("Test IPv6: Disabling IPv6, because it looks like it's not available. Reason: %s", sys.exc_info()[0] )
          return False