[SCM] Samba Shared Repository - branch master updated

Garming Sam garming at samba.org
Tue May 17 05:40:03 UTC 2016


The branch, master has been updated
       via  b3b2fee python/tests/dns_forwarder: fix for python 2.6
       via  87c5265 gitignore: ignore library bin directories
      from  c42c0c0 torture: Remove a use of get_my_vnn()

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b3b2fee1083d9c2d659eeb7853dedfff5534a627
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Fri May 13 12:52:18 2016 +1200

    python/tests/dns_forwarder: fix for python 2.6
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    
    Autobuild-User(master): Garming Sam <garming at samba.org>
    Autobuild-Date(master): Tue May 17 07:39:03 CEST 2016 on sn-devel-144

commit 87c52658c97f5602a1533b817e03f1b135fbd398
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Fri May 13 10:06:10 2016 +1200

    gitignore: ignore library bin directories
    
    The Ubuntu 10.04 autobuilds on sn-devel build the lib/* libraries into
    their own bin subdirectories; for example lib/ldb uses lib/ldb/bin. A
    recent commit broke these autobuilds by un-hiding these directories
    from git.
    
    Fixes c2649352e0917c3c2bcf1b7ad74d73d21e73be9c (".gitignore: don;t
    accidentally ignore some files").
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                          | 1 +
 python/samba/tests/dns_forwarder.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 5bad92c..33e8fc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /bin/
+/lib/*/bin/
 /st/
 .waf*
 .lock-wscript
diff --git a/python/samba/tests/dns_forwarder.py b/python/samba/tests/dns_forwarder.py
index a90b007..de36de9 100644
--- a/python/samba/tests/dns_forwarder.py
+++ b/python/samba/tests/dns_forwarder.py
@@ -76,7 +76,7 @@ def make_txt_record(records):
 
 class DNSTest(TestCase):
 
-    errcodes = {v: k for k, v in vars(dns).items() if k.startswith('DNS_RCODE_')}
+    errcodes = dict((v, k) for k, v in vars(dns).items() if k.startswith('DNS_RCODE_'))
 
     def assert_dns_rcode_equals(self, packet, rcode):
         "Helper function to check return code"


-- 
Samba Shared Repository



More information about the samba-cvs mailing list