#3977 Fix various minor typos
Closed by jhrozek. Opened by yurchor.
Unknown source master

Download 3977.patch

Minot typo fixes. Thanks in advance for reviewing.

Hello and thanks for the patch.

The changes look good with the exception of:

@@ -180,7 +180,7 @@ 
  #define SYSDB_LOCAL_VIEW_NAME "LOCAL" /* reserved for client-side overrides */
  #define SYSDB_VIEW_CLASS "view"
  #define SYSDB_VIEW_NAME "viewName"
- #define SYSDB_OVERRIDE_CLASS "overrride"
+ #define SYSDB_OVERRIDE_CLASS "override"
  #define SYSDB_OVERRIDE_ANCHOR_UUID "overrideAnchorUUID"
  #define SYSDB_OVERRIDE_USER_CLASS "userOverride"
  #define SYSDB_OVERRIDE_GROUP_CLASS "groupOverride"

I would prefer to keep the typo there in this case, because it specifies how some attributes are stored in local cache and changing the format would require update of the local cache version and a function that converts old cache to the new one would need to be added as well (which is IMO not worth the effort).

1 new commit added

  • Do not break existing caches

Hello and thanks for the patch.
The changes look good with the exception of:
@@ -180,7 +180,7 @@
#define SYSDB_LOCAL_VIEW_NAME "LOCAL" / reserved for client-side overrides /
#define SYSDB_VIEW_CLASS "view"
#define SYSDB_VIEW_NAME "viewName"
- #define SYSDB_OVERRIDE_CLASS "overrride"
+ #define SYSDB_OVERRIDE_CLASS "override"
#define SYSDB_OVERRIDE_ANCHOR_UUID "overrideAnchorUUID"
#define SYSDB_OVERRIDE_USER_CLASS "userOverride"
#define SYSDB_OVERRIDE_GROUP_CLASS "groupOverride"

I would prefer to keep the typo there in this case, because it specifies how some attributes are stored in local cache and changing the format would require update of the local cache version and a function that converts old cache to the new one would need to be added as well (which is IMO not worth the effort).

Should be fixed now. Thanks.

Because the second commit only fixes an issue that was introduced in the first commit, it makes sense to merge the two commits into one, so please squash the last commit into the first commit.

(if you know how to merge two commits feel free to ignore the rest of this comment and I am sorry for being captain obvious ) There are several ways to do it in git. You can do for example:
$ git rebase -i HEAD~2

This will pick the last two commits for interactive rebasing. You will see something like this:

pick 7471046fd Fix various minor typos
pick 5a217e271 Do not break existing caches

Now change the "pick" on the line with "Do not break exisitng caches" into "f". So you will get

pick 7471046fd Fix various minor typos
f 5a217e271 Do not break existing caches

Now save and exit. The second commit will be squashed into the first one and the commit message from the first one will be used. Becase the new patch in your local branch will conflict with your remote branch, you will need to force push the changes (--force when doing git push).

rebased onto 457786cb05d091f89d199c700996f75687756fad

There is one PEP8 issue detected after applying this patch:

$ pep8 src/tests/intg/ldap_local_override_test.py
src/tests/intg/ldap_local_override_test.py:533:40: E127 continuation line over-indented for visual indent

Please fix the issue, for example by applying this patch:

From 6ce7e8671bf6c7587598f044d9e4fcf238653f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
Date: Tue, 5 Mar 2019 15:42:19 +0100
Subject: [PATCH] fixup patch
---
 src/tests/intg/ldap_local_override_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/intg/ldap_local_override_test.py b/src/tests/intg/ldap_local_override_test.py
index 121e4c1e0..558a5787a 100644
--- a/src/tests/intg/ldap_local_override_test.py
+++ b/src/tests/intg/ldap_local_override_test.py
@@ -530,7 +530,7 @@ def test_imp_exp_user_override(ldap_conn, env_imp_exp_user_override):
 def test_imp_exp_user_override_noname(ldap_conn,
-                                       env_two_users_and_group):
+                                      env_two_users_and_group):
     # Override
     subprocess.check_call(["sss_override", "user-add", "user1",
-- 
2.19.1

And rebase the patches. Thanks.

rebased onto 5e67892849424ac8ba1a6f923ad0e864d8670681

Everything LGTM now.
Thanks!

ACK.

rebased onto 0d8dbcb0913ab26da7dc87edc92977056d871f33

I see you added one more change in src/man/pam_sss.8.xml after I acked the previous version of the patch.

The change is OK, so ACK to the new version as well.

I see you added one more change in src/man/pam_sss.8.xml after I acked the previous version of the patch.
The change is OK, so ACK to the new version as well.

Thanks.

Sorry for the last minute change. That was the final fix as I have finished translation now. No other typos were found.

No problem, it is good that you have found more issues :)

  • master: 293c09335bb179ca84698da86599125e81ad8bbf

Pull-Request has been closed by jhrozek

Metadata