389-ds-base

#49909 Remove Junk from resolving of git cherry-pick conflict
Closed by spichugi. Opened by slev.
slev/389-ds-base fix_cherry_pick  into  389-ds-base-1.3.8

Download 49909.patch

Easy fix for https://pagure.io/389-ds-base/issue/49908.
Just revert incorrect cherry, and then cherry-pick 2 commits.

Tests are OK:

 py.test3 /usr/lib/python3/site-packages/dirsrvtests/tests/suites/basic/
===================================== test session starts =====================================platform linux -- Python 3.6.5, pytest-3.4.2, py-1.5.3, pluggy-0.6.0
rootdir: /usr/lib/python3/site-packages/dirsrvtests/tests/suites/basic, inifile:
collected 23 items
../usr/lib/python3/site-packages/dirsrvtests/tests/suites/basic/basic_test.py ......... [ 39%]
..............                                                                          [100%]
================================= 23 passed in 157.33 seconds =================================

@mreynolds What happened here :|

Anyway, the change looks reasonable to me, but I want input from someone who is familiar with why this got into the repo in the first place.

Thanks @slev

@mreynolds What happened here :|

Yeah somehow I missed this when I cherry-picked https://pagure.io/389-ds-base/pull-request/49831 to 1.3.8

My bad :'-(

We are using python3 now, so is this still necessary?

Probably not. Remove and see what screams?

We are using python3 now, so is this still necessary?

As I see the problem is still here ( 389-ds-base-1.3.8 branch ).
Is it a problem to fix it instead of leaving as is?
Edited by slev

We are using python3 now, so is this still necessary?

As I see the problem is still here ( 389-ds-base-1.3.8 branch ).
Is it a problem to fix it instead of leaving as is?

Oh right, yeah 1.3.8 still has this issue. 1.4.0 is now using python3.

Two issues I see: one this needs to goto master branch as well (without all the python-six stuff), and I want @firstyear to confirm if he's okay with changing the mail attribute value from "first.lastname@mail.com" to "uid@mail.com"

Sorry I only just saw this: I have no issue with that change, it's just a dbgen test. :)

Looks good to me too. @slev could you please rebase it? We'll test it once again and we can merge

we may need to rebase and test ourselves, it has been a while and @slev may have moved on or be busy :)

rebased onto c787b13c8f1bd086bda284fcc21d25c94ac880a8

Hi, I rebased to upstream/389-ds-base-1.3.8

Thank you @slev, this looks good to me. @spichugi I'll let you check, but please merge asap to prevent any more rebasing needed.

LGTM

Pull-Request has been merged by mreynolds

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 pull request has been cloned to Github as issue and is available here:
- https://github.com/389ds/389-ds-base/issues/2968

If you want to continue to work on the PR, please navigate to the github issue,
download the patch from the attachments and file a new pull request.

Thank you for understanding. We apologize for all inconvenience.

Pull-Request has been closed by spichugi
Metadata
None
No Tags
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.