[Python-modules-commits] r23499 - in packages/circuits/trunk/debian (2 files)

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

    Date: Sunday, February 17, 2013 @ 05:03:13
  Author: eriol-guest
Revision: 23499

Updated to disable check for address if DEB_BUILD_OPTIONS contains
"parallel" option.

Modified:
  packages/circuits/trunk/debian/changelog
  packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2013-02-17 00:00:49 UTC (rev 23498)
+++ packages/circuits/trunk/debian/changelog	2013-02-17 05:03:13 UTC (rev 23499)
@@ -16,12 +16,15 @@
   * debian/patches/01_disable_sphinxcontrib-bitbucket.patch
     - Disable sphinxcontrib-bitbucket because it is not
       packaged for Debian
+  * debian/patches/03_force-localhost-as-host-name.patch
+    - Updated to disable check for address if DEB_BUILD_OPTIONS contains
+      "parallel" option. (Closes: #680799)
   * debian/rules
     - Used override_dh_installchangelogs to install upstream changelog
     - Clean circuits.egg-info/entry_points.txt to make the package
       build twice in a row
 
- -- Daniele Tricoli <eriol at mornie.org>  Sun, 17 Feb 2013 01:00:10 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 17 Feb 2013 05:58:38 +0100
 
 circuits (1.6-1) unstable; urgency=low
 

Modified: packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch
===================================================================
--- packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch	2013-02-17 00:00:49 UTC (rev 23498)
+++ packages/circuits/trunk/debian/patches/03_force-localhost-as-host-name.patch	2013-02-17 05:03:13 UTC (rev 23499)
@@ -1,9 +1,20 @@
-Description: Force localhost as hostname.
+Description: Force localhost as hostname and disable check for address if
+ DEB_BUILD_OPTIONS contains "parallel" option. Since these tests are conceived
+ not to run on parallel environment (they check the address against
+ gethostbyname(gethostname())), in a parallel environment the address check is
+ disabled. Also, localhost is forced because default /etc/hosts will return
+ 127.0.1.1.
 Author: Daniele Tricoli <eriol at mornie.org>
+Last-Update: 2013-02-17
 Forwarded: not-needed
 --- a/tests/web/test_logger.py
 +++ b/tests/web/test_logger.py
-@@ -5,7 +5,7 @@
+@@ -1,11 +1,12 @@
+ #!/usr/bin/env python
+
++import os
+ import sys
+ try:
      from StringIO import StringIO
  except ImportError:
      from io import StringIO
@@ -12,7 +23,7 @@
 
  from circuits.web import Controller, Logger
  from circuits.web.loggers import formattime
-@@ -43,7 +43,7 @@
+@@ -43,7 +44,7 @@
      format = logger.format
 
      try:
@@ -21,7 +32,20 @@
      except gaierror:
          address = "127.0.0.1"
 
-@@ -79,7 +79,7 @@
+@@ -57,6 +58,12 @@
+     d["f"] = ""
+     d["a"] = "Python-urllib/%s" % sys.version[:3]
+
++    try:
++        if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
++            del d['h']
++    except KeyError:
++        pass
++
+     keys = list(d.keys())
+
+     for k in keys:
+@@ -79,7 +86,7 @@
      format = logger.format
 
      try:
@@ -30,7 +54,20 @@
      except gaierror:
          address = "127.0.0.1"
 
-@@ -117,7 +117,7 @@
+@@ -93,6 +100,12 @@
+     d["f"] = ""
+     d["a"] = "Python-urllib/%s" % sys.version[:3]
+
++    try:
++        if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
++            del d['h']
++    except KeyError:
++        pass
++
+     keys = list(d.keys())
+
+     for k in keys:
+@@ -117,7 +130,7 @@
      format = logger.format
 
      try:
@@ -39,3 +76,16 @@
      except gaierror:
          address = "127.0.0.1"
 
+@@ -131,6 +144,12 @@
+     d["f"] = ""
+     d["a"] = "Python-urllib/%s" % sys.version[:3]
+
++    try:
++        if 'parallel' in os.environ['DEB_BUILD_OPTIONS']:
++            del d['h']
++    except KeyError:
++        pass
++
+     keys = list(d.keys())
+
+     for k in keys: