[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  da96d3f... Remove __contains__ from mock object for consistency with actual implementation.
       via  e490410... getntacl: Remove manpage for removed utility.
       via  8edab1b... Fix SharesContainer.__len__.
      from  20e1d5a... More formatting fixes.

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


- Log -----------------------------------------------------------------
commit da96d3fdba8dd317d931d36d101d956e829c07d8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Mar 1 03:46:56 2010 +0100

    Remove __contains__ from mock object for consistency with actual
    implementation.

commit e49041065f1a91ba49667c32964866538b77dad7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 8 03:26:18 2010 +0100

    getntacl: Remove manpage for removed utility.

commit 8edab1b96c47e75b2f2c61739f9283fa2ecf5cfe
Author: Ricardo Jorge <rvelhote at gmail.com>
Date:   Mon Feb 8 01:13:48 2010 +0100

    Fix SharesContainer.__len__.
    
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>

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

Summary of changes:
 source4/scripting/python/samba/shares.py       |    2 +-
 source4/scripting/python/samba/tests/shares.py |    3 --
 source4/utils/man/getntacl.1.xml               |   45 ------------------------
 3 files changed, 1 insertions(+), 49 deletions(-)
 delete mode 100644 source4/utils/man/getntacl.1.xml


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/shares.py b/source4/scripting/python/samba/shares.py
index 89a312e..b6ddeb3 100644
--- a/source4/scripting/python/samba/shares.py
+++ b/source4/scripting/python/samba/shares.py
@@ -37,7 +37,7 @@ class SharesContainer(object):
         return Share(self._lp[name])
 
     def __len__(self):
-        if "global" in self._lp:
+        if "global" in self._lp.services():
             return len(self._lp)-1
         return len(self._lp)
 
diff --git a/source4/scripting/python/samba/tests/shares.py b/source4/scripting/python/samba/tests/shares.py
index 9130c36..160e3cf 100644
--- a/source4/scripting/python/samba/tests/shares.py
+++ b/source4/scripting/python/samba/tests/shares.py
@@ -37,9 +37,6 @@ class MockLoadParm(object):
     def __getitem__(self, name):
         return MockService(self.data[name])
 
-    def __contains__(self, name):
-        return name in self.data
-
     def __len__(self):
         return len(self.data)
 
diff --git a/source4/utils/man/getntacl.1.xml b/source4/utils/man/getntacl.1.xml
deleted file mode 100644
index cbce5f2..0000000
--- a/source4/utils/man/getntacl.1.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="getntacl.1">
-
-<refmeta>
-	<refentrytitle>getntacl</refentrytitle>
-	<manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
-	<refname>getntacl</refname>
-	<refpurpose>Tool for displaying NT ACLs stored in extended attributes</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-	<cmdsynopsis>
-		<command>getntacl</command>
-		<arg choice="req">filename</arg>
-	</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-	<title>DESCRIPTION</title>
-
-	<para>Retrieves the NT security ACL on the specified file, as 
-stored in the filesystems' extended attribute. </para>
-</refsect1>
-
-<refsect1>
-	<title>VERSION</title>
-
-	<para>This man page is correct for version 4.0 of the Samba suite.</para>
-</refsect1>
-
-<refsect1>
-	<title>AUTHOR</title>
-
-	<para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
-
-	<para>This manpage was written by Jelmer Vernooij. </para>
-	
-</refsect1>
-
-</refentry>


-- 
Samba Shared Repository