[SCM] Samba Shared Repository - branch v4-4-test updated
Stefan Metzmacher
metze at samba.org
Tue Aug 16 07:54:04 UTC 2016
The branch, v4-4-test has been updated
via 39b4580 ldb-samba: Add "secret" as a value to hide in LDIF files
via 3d11e5f samba-tool/ldapcmp: ignore differences of whenChanged
via fd6d190 script/autobuild.py: include the branch name in the output
via 4245237 autobuild: fix typo in autobuild success subject line
via ec5f390 autobuild: Return the last 50 log lines
from 8620c56 dbwrap_ctdb: treat empty records in ltdb as non-existing
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test
- Log -----------------------------------------------------------------
commit 39b4580aea2d2e0548241bcd6191f85a369130b2
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Jan 2 20:58:39 2016 +1300
ldb-samba: Add "secret" as a value to hide in LDIF files
This is not secret or encrypted in LDAP, but is sensitive in secrets.ldb
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Autobuild-User(master): Garming Sam <garming at samba.org>
Autobuild-Date(master): Wed May 11 07:17:38 CEST 2016 on sn-devel-144
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12154
(cherry picked from commit 15f191a2329d08b92111f71e22f8a28c8a39c193)
Autobuild-User(v4-4-test): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(v4-4-test): Tue Aug 16 09:53:00 CEST 2016 on sn-devel-144
commit 3d11e5f4298e20f2c7543e4d18a60870079e05a9
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 8 12:53:26 2016 +0200
samba-tool/ldapcmp: ignore differences of whenChanged
This is implicitly replicated, but may diverge on updates of non-replicated
attributes.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12129
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Mon Aug 8 17:34:24 CEST 2016 on sn-devel-144
(cherry picked from commit a0e60e96aa38407ded8d63650dcf8f39304c958a)
commit fd6d1902bd1790d0147be2c0febb0f6ffb821482
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Aug 10 12:44:26 2016 +0200
script/autobuild.py: include the branch name in the output
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Thu Aug 11 08:38:47 CEST 2016 on sn-devel-144
(cherry picked from commit 98d289d2e5162a23d15562b009d0edf20a55a56b)
commit 4245237534ae28e79c121782a761246d5def9a82
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu May 5 10:37:08 2016 +1200
autobuild: fix typo in autobuild success subject line
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Autobuild-User(master): Garming Sam <garming at samba.org>
Autobuild-Date(master): Thu May 5 04:15:16 CEST 2016 on sn-devel-144
(cherry picked from commit 2fe2e662dba080536a0f6c5485514097dd74a65a)
commit ec5f3903dd070632a77a23590c803b2884781406
Author: Garming Sam <garming at catalyst.net.nz>
Date: Mon Mar 14 14:18:54 2016 +1300
autobuild: Return the last 50 log lines
This means that you don't have to deal with tars for quickly determining
the cause of a failure.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
(cherry picked from commit 3751ffbbe75524984a822d65f623a040ca79c8f7)
-----------------------------------------------------------------------
Summary of changes:
lib/ldb-samba/ldif_handlers.c | 2 +-
python/samba/netcmd/ldapcmp.py | 2 +-
script/autobuild.py | 29 +++++++++++++++++++++++------
3 files changed, 25 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb-samba/ldif_handlers.c b/lib/ldb-samba/ldif_handlers.c
index 3b84084..58b4ad7 100644
--- a/lib/ldb-samba/ldif_handlers.c
+++ b/lib/ldb-samba/ldif_handlers.c
@@ -1651,7 +1651,7 @@ const struct ldb_schema_syntax *ldb_samba_syntax_by_lDAPDisplayName(struct ldb_c
return s;
}
-static const char *secret_attributes[] = {DSDB_SECRET_ATTRIBUTES, NULL};
+static const char *secret_attributes[] = {DSDB_SECRET_ATTRIBUTES, "secret", NULL};
/*
register the samba ldif handlers
diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
index 96b94f2..cb02de2 100644
--- a/python/samba/netcmd/ldapcmp.py
+++ b/python/samba/netcmd/ldapcmp.py
@@ -438,7 +438,7 @@ class LDAPObject(object):
"uSNChanged",
"uSNCreated",
"uSNLastObjRem",
- # "whenChanged", # This is implicitly replicated
+ "whenChanged", # This is implicitly replicated, but may diverge on updates of non-replicated attributes
]
self.ignore_attributes = self.non_replicated_attributes
self.ignore_attributes += ["msExchServer1HighestUSN"]
diff --git a/script/autobuild.py b/script/autobuild.py
index 9f0d893..34c12be 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -560,7 +560,7 @@ def send_email(subject, text, log_tar):
s.quit()
def email_failure(status, failed_task, failed_stage, failed_tag, errstr,
- elapsed_time, log_base=None):
+ elapsed_time, log_base=None, add_log_tail=True):
'''send an email to options.email about the failure'''
elapsed_minutes = elapsed_time / 60.0
user = os.getenv("USER")
@@ -598,9 +598,26 @@ The top commit for the tree that was built was:
''' % (log_base, failed_tag, log_base, failed_tag, log_base, top_commit_msg)
+ if add_log_tail:
+ f = open("%s/%s.stdout" % (gitroot, failed_tag), 'r')
+ lines = f.readlines()
+ log_tail = "".join(lines[-50:])
+ num_lines = len(lines)
+ if num_lines < 50:
+ # Also include stderr (compile failures) if < 50 lines of stdout
+ f = open("%s/%s.stderr" % (gitroot, failed_tag), 'r')
+ log_tail += "".join(f.readlines()[-(50-num_lines):])
+
+ text += '''
+The last 50 lines of log messages:
+
+%s
+ ''' % log_tail
+ f.close()
+
logs = os.path.join(gitroot, 'logs.tar.gz')
- send_email('autobuild failure on %s for task %s during %s'
- % (platform.node(), failed_task, failed_stage),
+ send_email('autobuild[%s] failure on %s for task %s during %s'
+ % (options.branch, platform.node(), failed_task, failed_stage),
text, logs)
def email_success(elapsed_time, log_base=None):
@@ -631,7 +648,7 @@ The top commit for the tree that was built was:
''' % top_commit_msg
logs = os.path.join(gitroot, 'logs.tar.gz')
- send_email('autobuild sucess on %s ' % platform.node(),
+ send_email('autobuild[%s] success on %s' % (options.branch, platform.node()),
text, logs)
@@ -733,7 +750,7 @@ else:
AUTOBUILD FAILURE
-Your autobuild on %s failed after %.1f minutes
+Your autobuild[%s] on %s failed after %.1f minutes
when trying to test %s with the following error:
%s
@@ -742,7 +759,7 @@ the autobuild has been abandoned. Please fix the error and resubmit.
####################################################################
-''' % (platform.node(), elapsed_minutes, failed_task, errstr)
+''' % (options.branch, platform.node(), elapsed_minutes, failed_task, errstr)
cleanup()
print(errstr)
--
Samba Shared Repository
More information about the samba-cvs
mailing list