summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/mockldap/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/mockldap/files')
-rw-r--r--dev-python/mockldap/files/mapping.patch12
-rw-r--r--dev-python/mockldap/files/mockldap-0.1.5-modify_s-backport.patch21
2 files changed, 33 insertions, 0 deletions
diff --git a/dev-python/mockldap/files/mapping.patch b/dev-python/mockldap/files/mapping.patch
new file mode 100644
index 000000000000..f3cdd862a9d6
--- /dev/null
+++ b/dev-python/mockldap/files/mapping.patch
@@ -0,0 +1,12 @@
+Disable un-needed d'loading during doc build
+diff -ur mockldap-0.1.7.orig/docs/source/conf.py mockldap-0.1.7/docs/source/conf.py
+--- docs/source/conf.py 2014-03-08 00:51:00.000000000 +0800
++++ docs/source/conf.py 2014-04-12 16:04:52.113446583 +0800
+@@ -28,7 +28,6 @@
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = [
+ 'sphinx.ext.autodoc',
+- 'sphinx.ext.intersphinx',
+ 'sphinx.ext.viewcode',
+ ]
+
diff --git a/dev-python/mockldap/files/mockldap-0.1.5-modify_s-backport.patch b/dev-python/mockldap/files/mockldap-0.1.5-modify_s-backport.patch
new file mode 100644
index 000000000000..c66c63890aec
--- /dev/null
+++ b/dev-python/mockldap/files/mockldap-0.1.5-modify_s-backport.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Peter Sagerson <psagers.hg@ignorare.net>
+# Date 1392920906 28800
+# Node ID 6433fd7dc97473150114c06a90d189a62a39951f
+# Parent f298b032a25ef6c2bcc6749d9bf096352a49f37d
+Fix tests to match the recent modify_s change.
+
+diff --git a/src/mockldap/tests.py b/src/mockldap/tests.py
+--- a/src/mockldap/tests.py
++++ b/src/mockldap/tests.py
+@@ -453,8 +453,8 @@
+
+ self.ldapobj.modify_s(manager[0], mod_list)
+
+- self.assertNotIn('objectClass',
+- self.ldapobj.directory[manager[0]].keys())
++ self.assertEqual(self.ldapobj.directory[manager[0]]['objectClass'],
++ [])
+
+ def test_modify_s_invalid_dn(self):
+ mod_list = [(ldap.MOD_DELETE, 'objectClass', None)]