[Python-apps-commits] r14209 - in packages/sabnzbdplus/trunk/debian/patches (5 files)
jcfp-guest at users.alioth.debian.org
jcfp-guest at users.alioth.debian.org
Wed Jul 12 19:38:45 UTC 2017
Date: Wednesday, July 12, 2017 @ 19:38:44
Author: jcfp-guest
Revision: 14209
refresh patches for 2.2.0a2
Modified:
packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff
packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff
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/02_find_parts_in_usr_share.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff 2017-07-12 19:36:41 UTC (rev 14208)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.diff 2017-07-12 19:38:44 UTC (rev 14209)
@@ -11,16 +11,15 @@
sys.exit(1)
--- a/sabnzbd/constants.py
+++ b/sabnzbd/constants.py
-@@ -63,10 +63,10 @@
+@@ -61,9 +61,9 @@
+ DEF_COMPLETE_DIR = 'Downloads/complete'
DEF_ADMIN_DIR = 'admin'
- DEF_LOG_DIR = 'logs'
DEF_NZBBACK_DIR = ''
-DEF_LANGUAGE = 'locale'
-DEF_INTERFACES = 'interfaces'
+-DEF_EMAIL_TMPL = 'email'
+DEF_LANGUAGE = '../share/sabnzbdplus/locale'
+DEF_INTERFACES = '../share/sabnzbdplus/interfaces'
- DEF_INT_LANGUAGE = 'locale'
--DEF_EMAIL_TMPL = 'email'
+DEF_EMAIL_TMPL = '../share/sabnzbdplus/email'
DEF_STDCONFIG = 'Config'
DEF_STDINTF = 'Glitter'
Modified: packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff 2017-07-12 19:36:41 UTC (rev 14208)
+++ packages/sabnzbdplus/trunk/debian/patches/04_use_config_when_daemon.diff 2017-07-12 19:38:44 UTC (rev 14209)
@@ -1,7 +1,7 @@
# Use the normal configuration when run as a daemon
--- a/SABnzbd.py
+++ b/SABnzbd.py
-@@ -353,20 +353,7 @@
+@@ -325,20 +325,7 @@
def GetProfileInfo(vista_plus):
""" Get the default data locations """
ok = False
Modified: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff 2017-07-12 19:36:41 UTC (rev 14208)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff 2017-07-12 19:38:44 UTC (rev 14209)
@@ -1,10 +1,10 @@
# Use system python modules rather than included copies.
--- a/sabnzbd/config.py
+++ b/sabnzbd/config.py
-@@ -27,7 +27,7 @@
+@@ -29,7 +29,7 @@
+ from hashlib import md5
import sabnzbd.misc
from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER
- from sabnzbd.utils import listquote
-from sabnzbd.utils import configobj
+import configobj
from sabnzbd.decorators import synchronized
Modified: packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff 2017-07-12 19:36:41 UTC (rev 14208)
+++ packages/sabnzbdplus/trunk/debian/patches/08_disable_new_version_check.diff 2017-07-12 19:38:44 UTC (rev 14209)
@@ -1,7 +1,7 @@
# Disable the builtin check for newer versions.
--- a/sabnzbd/misc.py
+++ b/sabnzbd/misc.py
-@@ -595,6 +595,8 @@
+@@ -636,6 +636,8 @@
they are already using an alpha/beta/rc.
RC's are valued higher than Beta's, which are valued higher than Alpha's.
"""
@@ -12,7 +12,7 @@
return
--- a/sabnzbd/scheduler.py
+++ b/sabnzbd/scheduler.py
-@@ -171,16 +171,6 @@
+@@ -177,16 +177,6 @@
kronos.method.sequential, None, None)
__SCHED.add_single_task(rss.run_method, 'RSS', 15, kronos.method.sequential, None, None)
@@ -31,7 +31,7 @@
logging.info('Setting schedule for quota check daily at %s:%s', hour, minute)
--- a/interfaces/Config/templates/config_general.tmpl
+++ b/interfaces/Config/templates/config_general.tmpl
-@@ -179,15 +179,6 @@
+@@ -164,15 +164,6 @@
<input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
<span class="desc">$T('explain-auto_browser')</span>
</div>
Modified: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff 2017-07-12 19:36:41 UTC (rev 14208)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff 2017-07-12 19:38:44 UTC (rev 14209)
@@ -4,22 +4,22 @@
# - only run ipv6 test, ip address discovery functions when debugging
--- a/interfaces/wizard/one.html
+++ b/interfaces/wizard/one.html
-@@ -79,7 +79,11 @@
- </div>
- <div class="col-md-5">
- <div class="clearfix"></div>
-- <iframe style="float: right; width: 315px; height: 315px;" frameborder="0" src="https://resources.sabnzbd.org/wizard/ad/$language"></iframe>
-+ <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
-+ <b>Help</b>
-+ <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
-+ <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://resources.sabnzbd.org/wizard/ad/$language" target="_blank">sabnzbd.org</a>.<br/>
-+ </div>
- </div>
- </div>
- <input type="hidden" name="session" value="$session" />
+@@ -87,7 +87,11 @@
+ </div>
+ <div class="col-md-5">
+ <div class="clearfix"></div>
+- <iframe style="float: right; width: 315px; height: 315px;" frameborder="0" src="https://resources.sabnzbd.org/wizard/ad/$language"></iframe>
++ <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
++ <b>Help</b>
++ <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
++ <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://resources.sabnzbd.org/wizard/ad/$language" target="_blank">sabnzbd.org</a>.<br/>
++ </div>
+ </div>
+ </div>
+ <input type="hidden" name="session" value="$session" />
--- a/sabnzbd/__init__.py
+++ b/sabnzbd/__init__.py
-@@ -1192,6 +1192,8 @@
+@@ -1166,6 +1166,8 @@
logging.debug("Test IPv6: Disabling IPv6, because it looks like it's not available. Reason: %s", sys.exc_info()[0] )
return False
@@ -30,9 +30,9 @@
sock = socket.socket(af, socktype, proto)
--- a/sabnzbd/getipaddress.py
+++ b/sabnzbd/getipaddress.py
-@@ -67,6 +67,9 @@
- return ipv4
+@@ -69,6 +69,9 @@
+
def publicipv4():
+ if sabnzbd.cfg.log_level() < 2:
+ public_ipv4 = None
More information about the Python-apps-commits
mailing list