#49908 Junk from resolving of git cherry-pick conflict
Closed: wontfix 4 years ago by mreynolds. Opened 5 years ago by slev.

Version 1.3.8.7.
A cherry pick commit at @8720370b3f508d8da3ea42883bf65e50efa27ed3 introduced a junk like:

+<<<<<<< HEAD
 dc: example
 aci: (target=ldap:///{SUFFIX})(targetattr=*)(version 3.0; acl "acl1"; allow(write) userdn = "l
+=======
+dc: {RDN}
+aci: (target=ldap:///{SUFFIX})(targetattr=*)(version 3.0; acl "acl1"; allow(write) userdn = "l
+>>>>>>> 8fa838a4f... Ticket 49830 - Import fails if backend name is "default"

in src/lib389/lib389/dbgen.py.

Additionally, tests running as

py.test3 -v /usr/lib/python3/site-packages/dirsrvtests/tests/suites/basic/

fail with

>               output.write(DBGEN_OU_TEMPLATE.format(SUFFIX=suffix, OU=ou))
E               NameError: name 'DBGEN_OU_TEMPLATE' is not defined

/usr/lib/python3/site-packages/lib389/dbgen.py:168: NameError

============================ 1 failed, 22 passed in 81.61 seconds =============================

Metadata Update from @mreynolds:
- Custom field component adjusted to None
- Custom field origin adjusted to None
- Custom field reviewstatus adjusted to None
- Custom field type adjusted to None
- Custom field version adjusted to None
- Issue set to the milestone: 1.3.8

5 years ago

Metadata Update from @mreynolds:
- Issue close_status updated to: fixed
- Issue status updated to: Closed (was: Open)

4 years ago

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This issue has been cloned to Github and is available here:
- https://github.com/389ds/389-ds-base/issues/2967

If you want to receive further updates on the issue, please navigate to the github issue
and click on subscribe button.

Thank you for understanding. We apologize for all inconvenience.

Metadata Update from @spichugi:
- Issue close_status updated to: wontfix (was: fixed)

3 years ago

Login to comment on this ticket.

Metadata