Skip to content

Commit

Permalink
Use rpmfusion_cert.py to fix some issues.
Browse files Browse the repository at this point in the history
rpmfusion_cert.py available since rpmfusion-packager-0.6.1
  • Loading branch information
sergiomb2 committed Feb 7, 2018
1 parent 4f04dd8 commit 88f142e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def bash_completion_dir():

setup(
name="rfpkg",
version="1.25.2",
version="1.25.3",
author="Nicolas Chauvet",
author_email="[email protected]",
description=("RPM Fusion plugin to rpkg to manage "
Expand Down
4 changes: 2 additions & 2 deletions src/rfpkg/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import cli
import git
import re
import fedora_cert
import rpmfusion_cert
import platform
import subprocess
import urlparse
Expand Down Expand Up @@ -221,7 +221,7 @@ def load_target(self):
def load_user(self):
"""This sets the user attribute, based on the RPM Fusion SSL cert."""
try:
self._user = fedora_cert.read_user_cert()
self._user = rpmfusion_cert.read_user_cert()
except Exception as e:
self.log.debug('Could not read RPM Fusion cert, falling back to '
'default method: %s' % e)
Expand Down
2 changes: 1 addition & 1 deletion test/test_retire.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_retire_with_namespace(self, PkgDB):
self.assertEqual(PkgDB.return_value.retire_packages.call_args_list,
[mock.call('rfpkg', 'master', namespace='rpms')])

@mock.patch('fedora_cert.read_user_cert')
@mock.patch('rpmfusion_cert.read_user_cert')
@mock.patch('pkgdb2client.PkgDB')
def test_retire_without_namespace(self, PkgDB, read_user_cert):
self._setup_repo('ssh://[email protected]/rfpkg')
Expand Down

0 comments on commit 88f142e

Please sign in to comment.