folkslinux
/
libcomps
mirror of https://github.com/rpm-software-management/libcomps.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove non inclusive words

This commit is contained in:
Nicola Sella 2021-02-05 09:31:59 +01:00 committed by Jaroslav Mracek
parent 75da813731
commit d8d29a93a7
22 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcomps/docs/Doxyfile.user
View File

@ -1018,7 +1018,7 @@ HHC_LOCATION =
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
# controls if a separate .chi index file is generated (YES) or that
# it should be included in the master .chm file (NO).
# it should be included in the primary .chm file (NO).
GENERATE_CHI = NO

2
libcomps/docs/Doxyfile.user.in
View File

@ -1040,7 +1040,7 @@ HHC_LOCATION =
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
# controls if a separate .chi index file is generated (YES) or that
# it should be included in the master .chm file (NO).
# it should be included in the primary .chm file (NO).
GENERATE_CHI = NO

16
libcomps/src/comps_doc.c
View File

@ -123,13 +123,13 @@ signed char comps_doc_cmp_u(COMPS_Object *obj1, COMPS_Object *obj2) {
return ret;
}
tmp1 = (COMPS_Object*) comps_doc_blacklist(_doc1_);
tmp2 = (COMPS_Object*) comps_doc_blacklist(_doc2_);
tmp1 = (COMPS_Object*) comps_doc_blocklist(_doc1_);
tmp2 = (COMPS_Object*) comps_doc_blocklist(_doc2_);
ret = comps_object_cmp(tmp1, tmp2);
COMPS_OBJECT_DESTROY(tmp1);
COMPS_OBJECT_DESTROY(tmp2);
if (!ret) {
//printf("blacklist cmp fail\n");
//printf("blocklist cmp fail\n");
return ret;
}
@ -163,9 +163,9 @@ COMPS_DOC_ADDOBJLIST(environments, environment, COMPS_DocEnv) /*comps_doc.h macr
COMPS_DOC_GETOBJDICT(langpacks) /*comps_doc.h macro*/
COMPS_DOC_SETOBJDICT(langpacks) /*comps_doc.h macro*/
COMPS_DOC_ADDOBJDICT(langpacks, langpack) /*comps_doc.h macro*/
COMPS_DOC_GETOBJMDICT(blacklist) /*comps_doc.h macro*/
COMPS_DOC_SETOBJMDICT(blacklist) /*comps_doc.h macro*/
COMPS_DOC_ADDOBJMDICT(blacklist, blacklist) /*comps_doc.h macro*/
COMPS_DOC_GETOBJMDICT(blocklist) /*comps_doc.h macro*/
COMPS_DOC_SETOBJMDICT(blocklist) /*comps_doc.h macro*/
COMPS_DOC_ADDOBJMDICT(blocklist, blocklist) /*comps_doc.h macro*/
COMPS_DOC_GETOBJMDICT(whiteout) /*comps_doc.h macro*/
COMPS_DOC_SETOBJMDICT(whiteout) /*comps_doc.h macro*/
COMPS_DOC_ADDOBJMDICT(whiteout, whiteout) /*comps_doc.h macro*/
@ -730,9 +730,9 @@ static signed char comps_doc_xml(COMPS_Doc *doc, xmlTextWriterPtr writer,
}
COMPS_OBJECT_DESTROY(dict);
mdict = comps_doc_blacklist(doc);
mdict = comps_doc_blocklist(doc);
if (mdict && mdict->len) {
retc = xmlTextWriterStartElement(writer, BAD_CAST "blacklist");
retc = xmlTextWriterStartElement(writer, BAD_CAST "blocklist");
if (__comps_check_xml_get(retc, (COMPS_Object*)doc->log) < 0) {
return -1;
}

20
libcomps/src/comps_doc.h
View File

@ -288,10 +288,10 @@ HEAD_COMPS_DOC_GETOBJLIST(environments) /*comps_doc.h macro*/
* @return COMPS_ObjDict object of COMPS_Str*/
HEAD_COMPS_DOC_GETOBJDICT(langpacks) /*comps_doc.h macro*/
/** comps blacklist dictionary getter
/** comps blocklist dictionary getter
* @param doc COMPS_Doc instance
* @return COMPS_ObjMDict object of COMPS_Str*/
HEAD_COMPS_DOC_GETOBJMDICT(blacklist) /*comps_doc.h macro*/
HEAD_COMPS_DOC_GETOBJMDICT(blocklist) /*comps_doc.h macro*/
/** comps whiteout dictionary getter
* @param doc COMPS_Doc instance
@ -336,13 +336,13 @@ HEAD_COMPS_DOC_SETOBJLIST(environments) /*comps_doc.h macro*/
*/
HEAD_COMPS_DOC_SETOBJDICT(langpacks) /*comps_doc.h macro*/
/** comps blacklist multi-dict setter
/** comps blocklist multi-dict setter
* @param doc COMPS_Doc instance
* @param dict COMPS_ObjMDict of COMPS_Str items
* \warning make sure of correct items type. Setter doesn't provide any
* additional control routines
*/
HEAD_COMPS_DOC_SETOBJMDICT(blacklist) /*comps_doc.h macro*/
HEAD_COMPS_DOC_SETOBJMDICT(blocklist) /*comps_doc.h macro*/
/** comps whiteout multi-dict setter
* @param doc COMPS_Doc instance
@ -392,21 +392,21 @@ HEAD_COMPS_DOC_ADDOBJLIST(environment, COMPS_DocEnv) /*comps_doc.h macro*/
*/
HEAD_COMPS_DOC_ADDOBJDICT(langpack) /*comps_doc.h macro*/
/** Blacklist adder to blacklist multi-dict in COMPS_Doc
/** Blocklist adder to blocklist multi-dict in COMPS_Doc
* @param doc COMPS_Doc instance
* @param key COMPS_Str dictionary key of blacklist
* @param obj COMPS_Str blacklist item
* append blacklist item object to blacklist in COMPS_Doc structure. Items
* @param key COMPS_Str dictionary key of blocklist
* @param obj COMPS_Str blocklist item
* append blocklist item object to blocklist in COMPS_Doc structure. Items
* with same key are grouped in COMPS_ObjList object.
* \warning function doesn't increment obj param reference count.
*/
HEAD_COMPS_DOC_ADDOBJMDICT(blacklist) /*comps_doc.h macro*/
HEAD_COMPS_DOC_ADDOBJMDICT(blocklist) /*comps_doc.h macro*/
/** whiteout adder to whitetout multi-dict in COMPS_Doc
* @param doc COMPS_Doc instance
* @param key COMPS_Str dictionary key of whiteout
* @param obj COMPS_Str whiteout item
* append whiteout item object to blacklist in COMPS_Doc structure. Items
* append whiteout item object to blocklist in COMPS_Doc structure. Items
* with same key are grouped in COMPS_ObjList object.
* \warning function doesn't increment obj param reference count.
*/

12
libcomps/src/comps_elem.c
View File

@ -198,12 +198,12 @@ const COMPS_ElemInfo COMPS_MATCH_ElemInfo = {
.postproc = NULL//&comps_elem_match_postproc
};
const COMPS_ElemInfo COMPS_BLACKLIST_ElemInfo = {
.name = "blacklist",
.name = "blocklist",
.ancestors = (const COMPS_ElemType[]){COMPS_ELEM_DOC,
COMPS_ELEM_SENTINEL},
.attributes = (const COMPS_ElemAttrInfo*[]){NULL},
.preproc = NULL,//&comps_elem_blacklist_preproc,
.postproc = NULL//&comps_elem_blacklist_postproc
.preproc = NULL,//&comps_elem_blocklist_preproc,
.postproc = NULL//&comps_elem_blocklist_postproc
};
const COMPS_ElemInfo COMPS_PACKAGE_ElemInfo = {
.name = "package",
@ -357,7 +357,7 @@ char * comps_elem_get_name(COMPS_ElemType type) {
return "whiteout";
break;
case COMPS_ELEM_BLACKLIST:
return "blacklist";
return "blocklist";
break;
case COMPS_ELEM_PACKAGE:
return "package";
@ -394,7 +394,7 @@ COMPS_ElemType comps_elem_get_type(const char * name) {
else if (strcmp(name, "optionlist") == 0) type = COMPS_ELEM_OPTLIST;
else if (strcmp(name, "langpacks") == 0) type = COMPS_ELEM_LANGPACKS;
else if (strcmp(name, "match") == 0) type = COMPS_ELEM_MATCH;
else if (strcmp(name, "blacklist") == 0) type = COMPS_ELEM_BLACKLIST;
else if (strcmp(name, "blocklist") == 0) type = COMPS_ELEM_BLACKLIST;
else if (strcmp(name, "package") == 0) type = COMPS_ELEM_PACKAGE;
else if (strcmp(name, "whiteout") == 0) type = COMPS_ELEM_WHITEOUT;
else if (strcmp(name, "ignoredep") == 0) type = COMPS_ELEM_IGNOREDEP;
@ -699,7 +699,7 @@ void comps_elem_match_preproc(COMPS_Parsed *parsed, COMPS_Elem *elem) {
comps_str(comps_dict_get(elem->attrs, "install")));
}
void comps_elem_package_preproc(COMPS_Parsed *parsed, COMPS_Elem *elem) {
comps_doc_add_blacklist(parsed->comps_doc,
comps_doc_add_blocklist(parsed->comps_doc,
comps_dict_get(elem->attrs, "name"),
comps_str((comps_dict_get(elem->attrs, "arch"))));
}

2
libcomps/src/comps_types.c
View File

@ -24,7 +24,7 @@ COMPS_XMLOptions COMPS_XMLDefaultOptions = {
.empty_categories = false,
.empty_environments = false,
.empty_langpacks = false,
.empty_blacklist = false,
.empty_blocklist = false,
.empty_whiteout = false,
.empty_packages = false,
.empty_grouplist = false,

2
libcomps/src/comps_types.h
View File

@ -30,7 +30,7 @@ typedef struct COMPS_XMLOptions {
bool empty_categories;
bool empty_environments;
bool empty_langpacks;
bool empty_blacklist;
bool empty_blocklist;
bool empty_whiteout;
bool empty_packages;
bool empty_grouplist;

2
libcomps/src/python/docs/Doxyfile.user.in
View File

@ -1018,7 +1018,7 @@ HHC_LOCATION =
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
# controls if a separate .chi index file is generated (YES) or that
# it should be included in the master .chm file (NO).
# it should be included in the primary .chm file (NO).
GENERATE_CHI = NO

2
libcomps/src/python/docs/doc-sources/comps.rst
View File

@ -13,7 +13,7 @@
.. note::
:members: blacklist, langpacks, whiteout
:members: blocklist, langpacks, whiteout
are Fedora objects only

2
libcomps/src/python/docs/doc-sources/conf.py.in
View File

@ -43,7 +43,7 @@ source_suffix = '.rst'
# The encoding of source files.
#source_encoding = 'utf-8-sig'
# The master toctree document.
# The primary toctree document.
master_doc = 'index'
# General information about the project.

2
libcomps/src/python/docs/doc-sources/index.rst
View File

@ -1,4 +1,4 @@
.. x documentation master file, created by
.. x documentation primary file, created by
sphinx-quickstart on Mon Dec 9 16:34:26 2013.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.

24
libcomps/src/python/src/pycomps.c
View File

@ -35,7 +35,7 @@ char __pycomps_dict_to_xml_opts(PyObject* pobj, void *cobj) {
int x;
const char *keys[] = {"empty_groups", "empty_categories",
"empty_environments", "empty_langpacks",
"empty_blacklist", "empty_whiteout",
"empty_blocklist", "empty_whiteout",
"empty_packages", "empty_grouplist",
"empty_optionlist", "uservisible_explicit",
"biarchonly_explicit", "default_explicit",
@ -46,7 +46,7 @@ char __pycomps_dict_to_xml_opts(PyObject* pobj, void *cobj) {
&(*options)->empty_categories,
&(*options)->empty_environments,
&(*options)->empty_langpacks,
&(*options)->empty_blacklist,
&(*options)->empty_blocklist,
&(*options)->empty_whiteout,
&(*options)->empty_packages,
&(*options)->empty_grouplist,
@ -246,7 +246,7 @@ PyObject* PyCOMPS_fromxml_f(PyObject *self, PyObject *args, PyObject* kwds) {
Py_CLEAR(self_comps->p_categories);
Py_CLEAR(self_comps->p_environments);
Py_CLEAR(self_comps->p_langpacks);
Py_CLEAR(self_comps->p_blacklist);
Py_CLEAR(self_comps->p_blocklist);
Py_CLEAR(self_comps->p_whiteout);
@ -351,7 +351,7 @@ PyObject* PyCOMPS_fromxml_str(PyObject *self, PyObject *args, PyObject *kwds) {
Py_CLEAR(self_comps->p_categories);
Py_CLEAR(self_comps->p_environments);
Py_CLEAR(self_comps->p_langpacks);
Py_CLEAR(self_comps->p_blacklist);
Py_CLEAR(self_comps->p_blocklist);
Py_CLEAR(self_comps->p_whiteout);
COMPS_OBJECT_DESTROY(self_comps->comps_doc);
@ -653,10 +653,10 @@ PyCOMPS_DGetSetClosure langpacks_closure = {&PyCOMPS_StrDictType,
offsetof(PyCOMPS, p_langpacks),
&comps_doc_langpacks,
&comps_doc_set_langpacks};
PyCOMPS_MDGetSetClosure blacklist_closure = {&PyCOMPS_MDictType,
offsetof(PyCOMPS, p_blacklist),
&comps_doc_blacklist,
&comps_doc_set_blacklist};
PyCOMPS_MDGetSetClosure blocklist_closure = {&PyCOMPS_MDictType,
offsetof(PyCOMPS, p_blocklist),
&comps_doc_blocklist,
&comps_doc_set_blocklist};
PyCOMPS_MDGetSetClosure whiteout_closure = {&PyCOMPS_MDictType,
offsetof(PyCOMPS, p_whiteout),
&comps_doc_whiteout,
@ -675,9 +675,9 @@ PyGetSetDef PyCOMPS_getset[] = {
{"langpacks",
(getter)PyCOMPS_get_, (setter)PyCOMPS_set_,
":py:class:`libcomps.StrDict` of langpacks", &langpacks_closure},
{"blacklist",
{"blocklist",
(getter)PyCOMPS_get_, (setter)PyCOMPS_set_,
":py:class:`libcomps.MDict` of blacklist", &blacklist_closure},
":py:class:`libcomps.MDict` of blocklist", &blocklist_closure},
{"whiteout",
(getter)PyCOMPS_get_, (setter)PyCOMPS_set_,
":py:class:`libcomps.MDict` of whiteout", &whiteout_closure},
@ -919,7 +919,7 @@ PyTypeObject PyCOMPS_Type = {
PyObject* Libcomps_xml_default(PyObject *self) {
const char *keys[] = {"empty_groups", "empty_categories",
"empty_environments", "empty_langpacks",
"empty_blacklist", "empty_whiteout",
"empty_blocklist", "empty_whiteout",
"empty_packages", "empty_grouplist",
"empty_optionlist", "uservisible_explicit",
"biarchonly_explicit",
@ -930,7 +930,7 @@ PyObject* Libcomps_xml_default(PyObject *self) {
&COMPS_XMLDefaultOptions.empty_categories,
&COMPS_XMLDefaultOptions.empty_environments,
&COMPS_XMLDefaultOptions.empty_langpacks,
&COMPS_XMLDefaultOptions.empty_blacklist,
&COMPS_XMLDefaultOptions.empty_blocklist,
&COMPS_XMLDefaultOptions.empty_whiteout,
&COMPS_XMLDefaultOptions.empty_packages,
&COMPS_XMLDefaultOptions.empty_grouplist,

2
libcomps/src/python/src/pycomps.h
View File

@ -69,7 +69,7 @@ typedef struct {
PyObject *p_categories;
PyObject *p_environments;
PyObject *p_langpacks;
PyObject *p_blacklist;
PyObject *p_blocklist;
PyObject *p_whiteout;
} PyCOMPS;

2
libcomps/src/python/tests/__test.py
View File

@ -662,7 +662,7 @@ class DictTest(unittest.TestCase):
#@unittest.skip("skip")
class MDictTest(unittest.TestCase):
def test_blacklist(self):
def test_blocklist(self):
bl1 = libcomps.Blacklist()
bl2 = libcomps.Blacklist()
self._test(bl1, bl2)

4
libcomps/src/python/tests/comps/comps-f21.xml
View File

@ -20084,7 +20084,7 @@
<match name="tesseract" install="tesseract-langpack-%s"/>
<match name="tkgate" install="tkgate-%s"/>
</langpacks>
<blacklist>
<blocklist>
<package name="dev"/>
<package name="system-config-mouse"/>
<package name="NetworkManager" arch="i386"/>
@ -20132,7 +20132,7 @@
<package name="kmymoney" arch="ppc64"/>
<package name="mysql" arch="ppc64"/>
<package name="nas" arch="ppc64"/>
</blacklist>
</blocklist>
<whiteout>
<ignoredep requires="Mesa" package="XFree86"/>
<ignoredep requires="XFree86-Mesa-libGL" package="XFree86-libs"/>

4
libcomps/src/python/tests/comps/comps-f21.xml.in
View File

@ -6694,7 +6694,7 @@
<match install="tesseract-langpack-%s" name="tesseract"/>
<match install="tkgate-%s" name="tkgate"/>
</langpacks>
<blacklist>
<blocklist>
<package name="dev"/>
<package name="system-config-mouse"/>
<package arch="i386" name="NetworkManager"/>
@ -6742,7 +6742,7 @@
<package arch="ppc64" name="kmymoney"/>
<package arch="ppc64" name="mysql"/>
<package arch="ppc64" name="nas"/>
</blacklist>
</blocklist>
<whiteout>
<ignoredep package="XFree86" requires="Mesa"/>
<ignoredep package="XFree86-libs" requires="XFree86-Mesa-libGL"/>

4
libcomps/src/python/tests/comps/comps-rawhide.xml
View File

@ -20034,7 +20034,7 @@
<match name="tesseract" install="tesseract-langpack-%s"/>
<match name="tkgate" install="tkgate-%s"/>
</langpacks>
<blacklist>
<blocklist>
<package name="dev"/>
<package name="system-config-mouse"/>
<package name="NetworkManager" arch="i386"/>
@ -20082,7 +20082,7 @@
<package name="kmymoney" arch="ppc64"/>
<package name="mysql" arch="ppc64"/>
<package name="nas" arch="ppc64"/>
</blacklist>
</blocklist>
<whiteout>
<ignoredep requires="Mesa" package="XFree86"/>
<ignoredep requires="XFree86-Mesa-libGL" package="XFree86-libs"/>

4
libcomps/src/python/tests/comps/f21-rawhide-comps.xml
View File

@ -20104,7 +20104,7 @@
<match name="tesseract" install="tesseract-langpack-%s"/>
<match name="tkgate" install="tkgate-%s"/>
</langpacks>
<blacklist>
<blocklist>
<package name="dev"/>
<package name="system-config-mouse"/>
<package name="NetworkManager" arch="i386"/>
@ -20152,7 +20152,7 @@
<package name="kmymoney" arch="ppc64"/>
<package name="mysql" arch="ppc64"/>
<package name="nas" arch="ppc64"/>
</blacklist>
</blocklist>
<whiteout>
<ignoredep requires="Mesa" package="XFree86"/>
<ignoredep requires="XFree86-Mesa-libGL" package="XFree86-libs"/>

4
libcomps/src/python/tests/comps/fedora_comps.xml
View File

@ -25173,7 +25173,7 @@
<match name="tesseract" install="tesseract-langpack-%s"/>
<match name="tkgate" install="tkgate-%s"/>
</langpacks>
<blacklist>
<blocklist>
<package name="dev"/>
<package name="system-config-mouse"/>
<package name="NetworkManager" arch="i386"/>
@ -25221,7 +25221,7 @@
<package name="kmymoney" arch="ppc64"/>
<package name="mysql" arch="ppc64"/>
<package name="nas" arch="ppc64"/>
</blacklist>
</blocklist>
<whiteout>
<ignoredep requires="Mesa" package="XFree86"/>
<ignoredep requires="XFree86-Mesa-libGL" package="XFree86-libs"/>

4
libcomps/src/python/tests/comps/sample_comps2.xml
View File

@ -20034,7 +20034,7 @@
<match name="tesseract" install="tesseract-langpack-%s"/>
<match name="tkgate" install="tkgate-%s"/>
</langpacks>
<blacklist>
<blocklist>
<package name="dev"/>
<package name="system-config-mouse"/>
<package name="NetworkManager" arch="i386"/>
@ -20082,7 +20082,7 @@
<package name="kmymoney" arch="ppc64"/>
<package name="mysql" arch="ppc64"/>
<package name="nas" arch="ppc64"/>
</blacklist>
</blocklist>
<whiteout>
<ignoredep requires="Mesa" package="XFree86"/>
<ignoredep requires="XFree86-Mesa-libGL" package="XFree86-libs"/>

4
libcomps/tests/f21-rawhide-comps.xml
View File

@ -20104,7 +20104,7 @@
<match name="tesseract" install="tesseract-langpack-%s"/>
<match name="tkgate" install="tkgate-%s"/>
</langpacks>
<blacklist>
<blocklist>
<package name="dev"/>
<package name="system-config-mouse"/>
<package name="NetworkManager" arch="i386"/>
@ -20152,7 +20152,7 @@
<package name="kmymoney" arch="ppc64"/>
<package name="mysql" arch="ppc64"/>
<package name="nas" arch="ppc64"/>
</blacklist>
</blocklist>
<whiteout>
<ignoredep requires="Mesa" package="XFree86"/>
<ignoredep requires="XFree86-Mesa-libGL" package="XFree86-libs"/>

4
libcomps/tests/fedora_comps.xml
View File

@ -25173,7 +25173,7 @@
<match name="tesseract" install="tesseract-langpack-%s"/>
<match name="tkgate" install="tkgate-%s"/>
</langpacks>
<blacklist>
<blocklist>
<package name="dev"/>
<package name="system-config-mouse"/>
<package name="NetworkManager" arch="i386"/>
@ -25221,7 +25221,7 @@
<package name="kmymoney" arch="ppc64"/>
<package name="mysql" arch="ppc64"/>
<package name="nas" arch="ppc64"/>
</blacklist>
</blocklist>
<whiteout>
<ignoredep requires="Mesa" package="XFree86"/>
<ignoredep requires="XFree86-Mesa-libGL" package="XFree86-libs"/>