Re: [Freeipa-devel] [PATCH 0501] Revert: switch /usr/bin/ipa to python3
On 14.06.2016 13:05, Martin Babinsky wrote:
On 06/14/2016 11:56 AM, Martin Basti wrote:
On 14.06.2016 10:14, Martin Basti wrote:
On 10.06.2016 10:57, Martin Basti wrote:
On 10.06.2016 06:17, Jan Cholasta wrote:
On 9.6.2016 20:57, Martin Basti wrote:
Py3 support was enabled prematurely, attached patches removes
python3
from /usr/bin/ipa
Notes:
* ipa 4.3.x won't have enabled py3
* master (ipa 4.4+) will have disabled py3 temporarily
NACK. you reverted this bit wrong:
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
+Requires: %{name}-client-common = %{version}-%{release}
+Requires: python2-ipalib = %{version}-%{release}
Shame on me,
updated patch attached
self NACK, even with reverted patch, /usr/bin/ipa has still configured
python3, it's a magic something is still putting python3 into ipa
Extra patch was added
now it should work
Martin^2
Thanks, ACK.
master:
* ee08f3e237cb3668c06307aad74e47eb20080474 Revert "Switch /usr/bin/ipa
to Python 3"
* 5760cc918247746a4e55adc118bdbd9ffb01b78f Use python2 for ipa cli
ipa-4-3:
* b3024fb879a6b841822df1e15fe1c6218c87a4bb Revert "Switch /usr/bin/ipa
to Python 3"
* 64f078b8b21314000ddf7e95c441570254e249f7 Use python2 for ipa cli
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0501] Revert: switch /usr/bin/ipa to python3
On 06/14/2016 11:56 AM, Martin Basti wrote:
On 14.06.2016 10:14, Martin Basti wrote:
On 10.06.2016 10:57, Martin Basti wrote:
On 10.06.2016 06:17, Jan Cholasta wrote:
On 9.6.2016 20:57, Martin Basti wrote:
Py3 support was enabled prematurely, attached patches removes python3
from /usr/bin/ipa
Notes:
* ipa 4.3.x won't have enabled py3
* master (ipa 4.4+) will have disabled py3 temporarily
NACK. you reverted this bit wrong:
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
+Requires: %{name}-client-common = %{version}-%{release}
+Requires: python2-ipalib = %{version}-%{release}
Shame on me,
updated patch attached
self NACK, even with reverted patch, /usr/bin/ipa has still configured
python3, it's a magic something is still putting python3 into ipa
Extra patch was added
now it should work
Martin^2
Thanks, ACK.
--
Martin^3 Babinsky
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0501] Revert: switch /usr/bin/ipa to python3
On 14.06.2016 10:14, Martin Basti wrote:
On 10.06.2016 10:57, Martin Basti wrote:
On 10.06.2016 06:17, Jan Cholasta wrote:
On 9.6.2016 20:57, Martin Basti wrote:
Py3 support was enabled prematurely, attached patches removes python3
from /usr/bin/ipa
Notes:
* ipa 4.3.x won't have enabled py3
* master (ipa 4.4+) will have disabled py3 temporarily
NACK. you reverted this bit wrong:
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
+Requires: %{name}-client-common = %{version}-%{release}
+Requires: python2-ipalib = %{version}-%{release}
Shame on me,
updated patch attached
self NACK, even with reverted patch, /usr/bin/ipa has still configured
python3, it's a magic something is still putting python3 into ipa
Extra patch was added
now it should work
Martin^2
From 305eaa7589b80a6ac4cf847e15b03be35a6a04f6 Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Tue, 14 Jun 2016 11:41:25 +0200
Subject: [PATCH] Use python2 for ipa cli
Switch 'ipa' command to py3 has been done prematurely, this commit sets python2 as interpreter for ipa cli.
https://fedorahosted.org/freeipa/ticket/5638
---
freeipa.spec.in | 5 +
1 file changed, 5 insertions(+)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index f51fec4ebf15ab73a4c4fe1c51647ce4709ee38b..522f537e9b9c51e1c09f7c045e640076e5f0d626 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -739,6 +739,11 @@ make client-install DESTDIR=%{buildroot}
(cd ipaclient && %{__python3} setup.py install --root %{buildroot})
%endif # with_python3
+# Switch shebang of /usr/bin/ipa
+# XXX: ipa cli is not stable enough for enabling py3 support, keep it in py2
+# in any case
+sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa
+
%find_lang %{gettext_domain}
mkdir -p %{buildroot}%{_usr}/share/ipa
--
2.5.5
From c7988f133de6d5d9a84e02e6d8b7f060173f757d Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Thu, 9 Jun 2016 20:37:55 +0200
Subject: [PATCH] Revert "Switch /usr/bin/ipa to Python 3"
This reverts commit 1ebd8334bc7da95f1edd64fc930e9cd6e3650534.
Switch 'ipa' command to py3 has been done prematurely, thus this commit
reverts it from IPA 4.3.2 and temporarily from master because it is
blocker for developing of the new features.
https://fedorahosted.org/freeipa/ticket/5638
---
freeipa.spec.in | 11 ---
ipa | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index ebd910a3df287a0154624391ddb54567cbb47364..c884990c3d158d4ae5bb84d869de4fde0915809b 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -421,11 +421,7 @@ Summary: IPA administrative tools
Group: System Environment/Base
BuildArch: noarch
Requires: %{name}-client-common = %{version}-%{release}
-%if 0%{?with_python3}
-Requires: python3-ipalib = %{version}-%{release}
-%else
Requires: python2-ipalib = %{version}-%{release}
-%endif
Requires: python-ldap
Provides: %{alt_name}-admintools = %{version}
@@ -741,13 +737,6 @@ make client-install DESTDIR=%{buildroot}
(cd ipapython && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} install)
(cd ipaplatform && %{__python3} setup.py install --root %{buildroot})
(cd ipaclient && %{__python3} setup.py install --root %{buildroot})
-
-# Switch shebang of /usr/bin/ipa
-# XXX: This script is installed with ipaserver. When all of ipaserver is
-# built with Python 3, this will no longer be necessary (as long as the py3
-# version is installed after the py2 version, so it overwrites /usr/bin/ipa)
-sed -i -e'1s/python\(2\|$\)/python3/' %{buildroot}%{_bindir}/ipa
-
%endif # with_python3
%find_lang %{gettext_domain}
diff --git a/ipa b/ipa
index 338105d7ec57897078c4e94cf5959259565624d2..64ceea49732bb11c4d69cf353d1a2d183e58981a 100755
--- a/ipa
+++ b/ipa
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
# Authors:
# Jason Gerard DeRose
--
2.5.5
From 606a8ed11692980d578c23d5bb70d10cd84f490d Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Fri, 10 Jun 2016 10:38:55 +0200
Subject: [PATCH] Revert "Switch /usr/bin/ipa to Python 3"
This reverts commit 1ebd8334bc7da95f1edd64fc930e9cd6e3650534.
Switch 'ipa' command to py3 has been done prematurely, thus this commit
reverts it from IPA 4.3.2 and temporarily from master because it is
blocker for developing of the new features.
https://fedorahosted.org/freeipa/ticket/5638
---
freeipa.spec.in | 11 ---
ipa | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 58344695cae08fa1baf2123a13eb99f3fbc6d496..f51fec4ebf15ab73a4c4fe1c51647ce4709ee38b 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -421,11 +421,7 @@ installed on every client machine.
Summary: IPA administrative tools
Group: System Environment/Base
BuildArch: noarch
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{versi
Re: [Freeipa-devel] [PATCH 0501] Revert: switch /usr/bin/ipa to python3
On 10.06.2016 10:57, Martin Basti wrote:
On 10.06.2016 06:17, Jan Cholasta wrote:
On 9.6.2016 20:57, Martin Basti wrote:
Py3 support was enabled prematurely, attached patches removes python3
from /usr/bin/ipa
Notes:
* ipa 4.3.x won't have enabled py3
* master (ipa 4.4+) will have disabled py3 temporarily
NACK. you reverted this bit wrong:
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
+Requires: %{name}-client-common = %{version}-%{release}
+Requires: python2-ipalib = %{version}-%{release}
Shame on me,
updated patch attached
self NACK, even with reverted patch, /usr/bin/ipa has still configured
python3, it's a magic something is still putting python3 into ipa
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0501] Revert: switch /usr/bin/ipa to python3
On 10.6.2016 10:57, Martin Basti wrote:
On 10.06.2016 06:17, Jan Cholasta wrote:
On 9.6.2016 20:57, Martin Basti wrote:
Py3 support was enabled prematurely, attached patches removes python3
from /usr/bin/ipa
Notes:
* ipa 4.3.x won't have enabled py3
* master (ipa 4.4+) will have disabled py3 temporarily
NACK. you reverted this bit wrong:
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
+Requires: %{name}-client-common = %{version}-%{release}
+Requires: python2-ipalib = %{version}-%{release}
Shame on me,
updated patch attached
LGTM.
--
Jan Cholasta
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0501] Revert: switch /usr/bin/ipa to python3
On 10.06.2016 06:17, Jan Cholasta wrote:
On 9.6.2016 20:57, Martin Basti wrote:
Py3 support was enabled prematurely, attached patches removes python3
from /usr/bin/ipa
Notes:
* ipa 4.3.x won't have enabled py3
* master (ipa 4.4+) will have disabled py3 temporarily
NACK. you reverted this bit wrong:
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
+Requires: %{name}-client-common = %{version}-%{release}
+Requires: python2-ipalib = %{version}-%{release}
Shame on me,
updated patch attached
From 606a8ed11692980d578c23d5bb70d10cd84f490d Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Fri, 10 Jun 2016 10:38:55 +0200
Subject: [PATCH] Revert "Switch /usr/bin/ipa to Python 3"
This reverts commit 1ebd8334bc7da95f1edd64fc930e9cd6e3650534.
Switch 'ipa' command to py3 has been done prematurely, thus this commit
reverts it from IPA 4.3.2 and temporarily from master because it is
blocker for developing of the new features.
https://fedorahosted.org/freeipa/ticket/5638
---
freeipa.spec.in | 11 ---
ipa | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 58344695cae08fa1baf2123a13eb99f3fbc6d496..f51fec4ebf15ab73a4c4fe1c51647ce4709ee38b 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -421,11 +421,7 @@ installed on every client machine.
Summary: IPA administrative tools
Group: System Environment/Base
BuildArch: noarch
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
Requires: python-ldap
Provides: %{alt_name}-admintools = %{version}
@@ -741,13 +737,6 @@ make client-install DESTDIR=%{buildroot}
(cd ipapython && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} install)
(cd ipaplatform && %{__python3} setup.py install --root %{buildroot})
(cd ipaclient && %{__python3} setup.py install --root %{buildroot})
-
-# Switch shebang of /usr/bin/ipa
-# XXX: This script is installed with ipaserver. When all of ipaserver is
-# built with Python 3, this will no longer be necessary (as long as the py3
-# version is installed after the py2 version, so it overwrites /usr/bin/ipa)
-sed -i -e'1s/python\(2\|$\)/python3/' %{buildroot}%{_bindir}/ipa
-
%endif # with_python3
%find_lang %{gettext_domain}
diff --git a/ipa b/ipa
index 342c5414792cbc2b6a2a393c5a3b8d9a54dbac80..9ef356868a444555172d35e5f44a86f6f9914d71 100755
--- a/ipa
+++ b/ipa
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
# Authors:
# Jason Gerard DeRose
--
2.5.5
From c7988f133de6d5d9a84e02e6d8b7f060173f757d Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Thu, 9 Jun 2016 20:37:55 +0200
Subject: [PATCH] Revert "Switch /usr/bin/ipa to Python 3"
This reverts commit 1ebd8334bc7da95f1edd64fc930e9cd6e3650534.
Switch 'ipa' command to py3 has been done prematurely, thus this commit
reverts it from IPA 4.3.2 and temporarily from master because it is
blocker for developing of the new features.
https://fedorahosted.org/freeipa/ticket/5638
---
freeipa.spec.in | 11 ---
ipa | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index ebd910a3df287a0154624391ddb54567cbb47364..c884990c3d158d4ae5bb84d869de4fde0915809b 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -421,11 +421,7 @@ Summary: IPA administrative tools
Group: System Environment/Base
BuildArch: noarch
Requires: %{name}-client-common = %{version}-%{release}
-%if 0%{?with_python3}
-Requires: python3-ipalib = %{version}-%{release}
-%else
Requires: python2-ipalib = %{version}-%{release}
-%endif
Requires: python-ldap
Provides: %{alt_name}-admintools = %{version}
@@ -741,13 +737,6 @@ make client-install DESTDIR=%{buildroot}
(cd ipapython && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} install)
(cd ipaplatform && %{__python3} setup.py install --root %{buildroot})
(cd ipaclient && %{__python3} setup.py install --root %{buildroot})
-
-# Switch shebang of /usr/bin/ipa
-# XXX: This script is installed with ipaserver. When all of ipaserver is
-# built with Python 3, this will no longer be necessary (as long as the py3
-# version is installed after the py2 version, so it overwrites /usr/bin/ipa)
-sed -i -e'1s/python\(2\|$\)/python3/' %{buildroot}%{_bindir}/ipa
-
%endif # with_python3
%find_lang %{gettext_domain}
diff --git a/ipa b/ipa
index 338105d7ec57897078c4e94cf5959259565624d2..64ceea49732bb11c4d69cf353d1a2d183e58981a 100755
--- a/ipa
+++ b/ipa
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
# Authors:
# Jason Gerard DeRose
--
2.5.5
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0501] Revert: switch /usr/bin/ipa to python3
On 9.6.2016 20:57, Martin Basti wrote:
Py3 support was enabled prematurely, attached patches removes python3
from /usr/bin/ipa
Notes:
* ipa 4.3.x won't have enabled py3
* master (ipa 4.4+) will have disabled py3 temporarily
NACK. you reverted this bit wrong:
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
+Requires: %{name}-client-common = %{version}-%{release}
+Requires: python2-ipalib = %{version}-%{release}
--
Jan Cholasta
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [PATCH 0501] Revert: switch /usr/bin/ipa to python3
Py3 support was enabled prematurely, attached patches removes python3
from /usr/bin/ipa
Notes:
* ipa 4.3.x won't have enabled py3
* master (ipa 4.4+) will have disabled py3 temporarily
From c6bdd4bf73332438bb429c32dac9598ce465f11d Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Thu, 9 Jun 2016 20:37:55 +0200
Subject: [PATCH] Revert "Switch /usr/bin/ipa to Python 3"
This reverts commit 1ebd8334bc7da95f1edd64fc930e9cd6e3650534.
Switch 'ipa' command to py3 has been done prematurely, thus this commit
reverts it from IPA 4.3.2 and temporarily from master because it is
blocker for developing of the new features.
https://fedorahosted.org/freeipa/ticket/5638
---
freeipa.spec.in | 13 ++---
ipa | 2 +-
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 58344695cae08fa1baf2123a13eb99f3fbc6d496..7bda38b0e85c6eb7cc8521ab8c46347367808b8d 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -421,11 +421,9 @@ installed on every client machine.
Summary: IPA administrative tools
Group: System Environment/Base
BuildArch: noarch
-%if 0%{?with_python3}
-Requires: python3-ipaclient = %{version}-%{release}
-%else
Requires: python2-ipaclient = %{version}-%{release}
-%endif
+Requires: %{name}-client-common = %{version}-%{release}
+Requires: python2-ipalib = %{version}-%{release}
Requires: python-ldap
Provides: %{alt_name}-admintools = %{version}
@@ -741,13 +739,6 @@ make client-install DESTDIR=%{buildroot}
(cd ipapython && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} install)
(cd ipaplatform && %{__python3} setup.py install --root %{buildroot})
(cd ipaclient && %{__python3} setup.py install --root %{buildroot})
-
-# Switch shebang of /usr/bin/ipa
-# XXX: This script is installed with ipaserver. When all of ipaserver is
-# built with Python 3, this will no longer be necessary (as long as the py3
-# version is installed after the py2 version, so it overwrites /usr/bin/ipa)
-sed -i -e'1s/python\(2\|$\)/python3/' %{buildroot}%{_bindir}/ipa
-
%endif # with_python3
%find_lang %{gettext_domain}
diff --git a/ipa b/ipa
index 342c5414792cbc2b6a2a393c5a3b8d9a54dbac80..9ef356868a444555172d35e5f44a86f6f9914d71 100755
--- a/ipa
+++ b/ipa
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
# Authors:
# Jason Gerard DeRose
--
2.5.5
From c7988f133de6d5d9a84e02e6d8b7f060173f757d Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Thu, 9 Jun 2016 20:37:55 +0200
Subject: [PATCH] Revert "Switch /usr/bin/ipa to Python 3"
This reverts commit 1ebd8334bc7da95f1edd64fc930e9cd6e3650534.
Switch 'ipa' command to py3 has been done prematurely, thus this commit
reverts it from IPA 4.3.2 and temporarily from master because it is
blocker for developing of the new features.
https://fedorahosted.org/freeipa/ticket/5638
---
freeipa.spec.in | 11 ---
ipa | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index ebd910a3df287a0154624391ddb54567cbb47364..c884990c3d158d4ae5bb84d869de4fde0915809b 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -421,11 +421,7 @@ Summary: IPA administrative tools
Group: System Environment/Base
BuildArch: noarch
Requires: %{name}-client-common = %{version}-%{release}
-%if 0%{?with_python3}
-Requires: python3-ipalib = %{version}-%{release}
-%else
Requires: python2-ipalib = %{version}-%{release}
-%endif
Requires: python-ldap
Provides: %{alt_name}-admintools = %{version}
@@ -741,13 +737,6 @@ make client-install DESTDIR=%{buildroot}
(cd ipapython && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} install)
(cd ipaplatform && %{__python3} setup.py install --root %{buildroot})
(cd ipaclient && %{__python3} setup.py install --root %{buildroot})
-
-# Switch shebang of /usr/bin/ipa
-# XXX: This script is installed with ipaserver. When all of ipaserver is
-# built with Python 3, this will no longer be necessary (as long as the py3
-# version is installed after the py2 version, so it overwrites /usr/bin/ipa)
-sed -i -e'1s/python\(2\|$\)/python3/' %{buildroot}%{_bindir}/ipa
-
%endif # with_python3
%find_lang %{gettext_domain}
diff --git a/ipa b/ipa
index 338105d7ec57897078c4e94cf5959259565624d2..64ceea49732bb11c4d69cf353d1a2d183e58981a 100755
--- a/ipa
+++ b/ipa
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
# Authors:
# Jason Gerard DeRose
--
2.5.5
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
