[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  8224a3d packaging: fix default systemd-dir path.
       via  1129388 python: fix the build with python3.
      from  7a3f97f selftest: fix envvars for creation of default user in wait_for_start

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


- Log -----------------------------------------------------------------
commit 8224a3d6a03aeb4648bb624f775b139115567a8f
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 16 16:25:01 2018 +0100

    packaging: fix default systemd-dir path.
    
    https://bugzilla.samba.org/show_bug.cgi?id=13227
    
    By default we should not end up with a
    /usr/usr/lib/systemd/system path.
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Tue Jan 16 21:02:28 CET 2018 on sn-devel-144

commit 112938879f9e04a9a4f3d2ed69efacf2bce83799
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jan 15 21:56:22 2018 +0100

    python: fix the build with python3.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13221
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

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

Summary of changes:
 packaging/wscript                              | 4 ++--
 python/samba/emulate/traffic_packets.py        | 2 +-
 python/samba/forest_update.py                  | 4 ++--
 python/samba/tests/blackbox/traffic_summary.py | 2 +-
 python/samba/tests/samba_tool/visualize.py     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/wscript b/packaging/wscript
index 76158e9..6cee6b9 100644
--- a/packaging/wscript
+++ b/packaging/wscript
@@ -10,9 +10,9 @@ def set_options(opt):
                   action="store_true", dest="systemd_install_services", default=False)
 
     gr.add_option('--with-systemddir',
-                  help=("systemd service directory [PREFIX/usr/lib/systemd/system]"),
+                  help=("systemd service directory [PREFIX/lib/systemd/system]"),
                   action="store", dest="SYSTEMDDIR",
-                  default="${PREFIX}/usr/lib/systemd/system")
+                  default="${PREFIX}/lib/systemd/system")
     #
     # extra service directives
     #
diff --git a/python/samba/emulate/traffic_packets.py b/python/samba/emulate/traffic_packets.py
index 1df21f9..185d1d5 100644
--- a/python/samba/emulate/traffic_packets.py
+++ b/python/samba/emulate/traffic_packets.py
@@ -84,7 +84,7 @@ name_formats = [
 
 
 def warning(message):
-    print "\033[37;41;1m" "Warning: %s" "\033[00m" % (message)
+    print("\033[37;41;1m" "Warning: %s" "\033[00m" % (message))
 
 ###############################################################################
 #
diff --git a/python/samba/forest_update.py b/python/samba/forest_update.py
index 9f6ddf6..ba6f859 100644
--- a/python/samba/forest_update.py
+++ b/python/samba/forest_update.py
@@ -300,8 +300,8 @@ objectClass: container
                                                "SCHEMA_DN":
                                                str(self.schema_dn)})
         if self.verbose:
-            print "UPDATE (LDIF) ------ OPERATION %d" % op
-            print sub_ldif
+            print("UPDATE (LDIF) ------ OPERATION %d" % op)
+            print(sub_ldif)
 
         self.samdb.modify_ldif(sub_ldif)
         if self.add_update_container:
diff --git a/python/samba/tests/blackbox/traffic_summary.py b/python/samba/tests/blackbox/traffic_summary.py
index b2bbc2c..99fe6b8 100644
--- a/python/samba/tests/blackbox/traffic_summary.py
+++ b/python/samba/tests/blackbox/traffic_summary.py
@@ -59,7 +59,7 @@ class TrafficSummaryTests(BlackboxTestCase):
 
         with temp_file(self.tempdir) as output:
             command  = "%s %s >%s" % (SCRIPT, INPUT, output)
-            print command
+            print(command)
             self.check_run(command)
             expected = open(EXPECTED_FN).readlines()
             actual = open(output).readlines()
diff --git a/python/samba/tests/samba_tool/visualize.py b/python/samba/tests/samba_tool/visualize.py
index 292d496..c00c6ea 100644
--- a/python/samba/tests/samba_tool/visualize.py
+++ b/python/samba/tests/samba_tool/visualize.py
@@ -284,7 +284,7 @@ class SambaToolVisualizeLdif(SambaToolCmdTest):
                                         self.tempdir,
                                         self.lp, tag='disconnected')
         dburl = 'tdb://' + dbfile
-        print dbfile
+        print(dbfile)
         result, output, err = self.runsubcmd("visualize", "ntdsconn",
                                              '-H', dburl,
                                              '--color=no', '-S')
@@ -314,7 +314,7 @@ class SambaToolVisualizeLdif(SambaToolCmdTest):
                                           '-o', '-')
         self.assertCmdSuccess(result, dot, err)
         self.remove_files(dbfile)
-        print dot
+        print(dot)
 
         self.assertStringsEqual(EXPECTED_DOT_NTDSCONN_DISCONNECTED, dot,
                                 strip=True)
@@ -338,7 +338,7 @@ class SambaToolVisualizeLdif(SambaToolCmdTest):
         self.assertStringsEqual(EXPECTED_DOT_NTDSCONN_DISCONNECTED, dot)
 
         self.remove_files(dbfile, dot_file)
-        print dot
+        print(dot)
 
 EXPECTED_DOT_MULTISITE_NO_KEY = r"""/* generated by samba */
 digraph A_samba_tool_production {


-- 
Samba Shared Repository