Skip to content

Commit

Permalink
Sync with an old version of Fedora-packager
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiomb2 committed Nov 27, 2019
1 parent c0aab91 commit c367812
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
* Wed Nov 27 2019 Sérgio Basto <[email protected]> - 0.6.5-2
- Fix Python2 with sync with an old version of Fedora-packager

* Thu Oct 03 2019 Sérgio Basto <[email protected]> - 0.6.5-1
- Add bash completions for koji-rpmfusion command
- Update .gitignore
- Turn off crl certificate check, never worked anyway
- Add bash-completion file to the package

* Sat Aug 24 2019 Leigh Scott <[email protected]> - 0.6.4-2
- Rebuild for python-3.8
Expand Down
1 change: 0 additions & 1 deletion src/rpmfusion-cert.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# option) any later version. See http://www.gnu.org/copyleft/gpl.html for
# the full text of the license.

from __future__ import print_function
import optparse
import rpmfusion_cert
import os.path
Expand Down
3 changes: 3 additions & 0 deletions src/rpmfusion-packager-setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ if __name__ == "__main__":
print("~/.rpmfusion.user already exists - skipping")
if not os.path.isfile(os.path.join(USERHOME, '.rpmfusion.cert')):
print("You need a client certificate from the RPM Fusion Account System")
print("You might want to run rpmfusion-cert -n to "
"regenerate SSL certificate. For more info see "
"https://rpmfusion.org/Contributors#If_SSL_certificate_expired")
print("Please download one from https://admin.rpmfusion.org/accounts/user/gencert")
print("Save it to ~/.rpmfusion.cert and re-run this script")
sys.exit(1)
Expand Down
5 changes: 1 addition & 4 deletions src/rpmfusion_cert/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
# option) any later version. See http://www.gnu.org/copyleft/gpl.html for
# the full text of the license.

from __future__ import print_function

from builtins import str
from six.moves import input
import os
import getpass
from fedora.client.fas2 import AccountSystem
Expand All @@ -25,6 +21,7 @@
from OpenSSL import crypto
import requests
import datetime
from six.moves import input

# Define our own error class
class rpmfusion_cert_error(Exception):
Expand Down

2 comments on commit c367812

@leigh123linux
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you wasting time with python2 support?, only el7 uses it.

@sergiomb2
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

el7 , I hope it is the last fix for python2

Please sign in to comment.