From: Petr Lautrbach <plautrba@redhat.com>
To: selinux@tycho.nsa.gov
Subject: Re: [PATCH] Fix recently introduced TabError's
Date: Fri, 26 May 2017 16:33:04 +0200 [thread overview]
Message-ID: <20170526143303.GA7094@pl-workstation.usersys.redhat.com> (raw)
In-Reply-To: <20170526140951.5112-1-plautrba@redhat.com>
On Fri, May 26, 2017 at 04:09:51PM +0200, Petr Lautrbach wrote:
> Commits a3d2c7a 6a7a5aa introduced inconsistent use of tabs and spaces
> in indentation what makes python3.6 unhappy.
>
There's another python3 problem with using "print ". I'll resend another
patch which will it together with use of tabs and spaces.
> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
> ---
> libsemanage/utils/semanage_migrate_store | 4 ++--
> python/semanage/seobject.py | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store
> index 9a9fac22..2e6cb278 100755
> --- a/libsemanage/utils/semanage_migrate_store
> +++ b/libsemanage/utils/semanage_migrate_store
> @@ -254,8 +254,8 @@ if __name__ == "__main__":
> "policy.kern",
> "file_contexts",
> "homedir_template",
> - "pkeys.local",
> - "ibendports.local"]
> + "pkeys.local",
> + "ibendports.local"]
>
>
> create_dir(newroot_path(), 0o755)
> diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
> index 61be6198..c97a9f0c 100644
> --- a/python/semanage/seobject.py
> +++ b/python/semanage/seobject.py
> @@ -1321,10 +1321,10 @@ class ibpkeyRecords(semanageRecords):
> semanageRecords.__init__(self, store)
>
> def __genkey(self, pkey, subnet_prefix):
> - if subnet_prefix == "":
> + if subnet_prefix == "":
> raise ValueError(_("Subnet Prefix is required"))
>
> - pkeys = pkey.split("-")
> + pkeys = pkey.split("-")
> if len(pkeys) == 1:
> high = low = int(pkeys[0], 0)
> else:
> @@ -1576,7 +1576,7 @@ class ibendportRecords(semanageRecords):
> semanageRecords.__init__(self, store)
>
> def __genkey(self, ibendport, ibdev_name):
> - if ibdev_name == "":
> + if ibdev_name == "":
> raise ValueError(_("IB device name is required"))
>
> port = int(ibendport)
> --
> 2.13.0
>
next prev parent reply other threads:[~2017-05-26 14:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-26 14:09 [PATCH] Fix recently introduced TabError's Petr Lautrbach
2017-05-26 14:33 ` Petr Lautrbach [this message]
2017-05-26 14:36 ` Stephen Smalley
2017-05-26 14:34 ` Petr Lautrbach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170526143303.GA7094@pl-workstation.usersys.redhat.com \
--to=plautrba@redhat.com \
--cc=selinux@tycho.nsa.gov \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.