IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update qrcode support for newer python-qrcode

Browse Source 
This substantially reduces the FreeIPA dependencies and allows
QR codes to fit in a standard terminal.

https://fedorahosted.org/freeipa/ticket/4430

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Nathaniel McCallum 2014-09-10 17:35:37 -04:00 committed by Petr Vobornik
parent 4e6a3c69b0
commit 9c50f9f957
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freeipa.spec.in
View File

@ -59,7 +59,7 @@ BuildRequires: python-memcached
BuildRequires: sssd >= 1.9.2
BuildRequires: python-lxml
BuildRequires: python-pyasn1 >= 0.0.9a
BuildRequires: python-qrcode
BuildRequires: python-qrcode-core >= 5.0.0
BuildRequires: python-dns
BuildRequires: m2crypto
BuildRequires: check
@ -248,7 +248,7 @@ Requires: python-nss >= 0.15
Requires: python-lxml
Requires: python-netaddr
Requires: libipa_hbac-python
Requires: python-qrcode
Requires: python-qrcode-core >= 5.0.0
Requires: python-pyasn1
Requires: python-dateutil
Requires: python-yubico

4
ipalib/plugins/otptoken.py
View File

@ -246,7 +246,7 @@ class otptoken_add(LDAPCreate):
msg_summary = _('Added OTP token "%(value)s"')
takes_options = LDAPCreate.takes_options + (
Flag('qrcode?', label=_('Display QR code (requires wide terminal)')),
Flag('qrcode?', label=_('Display QR code')),
)
has_output_params = LDAPCreate.has_output_params + (
@ -328,7 +328,7 @@ class otptoken_add(LDAPCreate):
qr = qrcode.QRCode()
qr.add_data(uri)
qr.make()
qr.print_tty()
qr.print_ascii(tty=True)
print "\n"
return rv