Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Whitespace fixes #14

Merged
merged 5 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions mrepo.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ def __init__(self):
self.reposyncoptions = self.getoption('main', 'reposync-options', '')
self.reposynccleanup = self.getoption('main', 'reposync-cleanup', 'yes') not in disable
self.reposyncnewestonly = self.getoption('main', 'reposync-newest-only', 'no') not in disable
self.reposyncexcldebug = self.getoption('main','reposync-exclude-debug', 'yes') not in disable
self.reposyncnorepopath = self.getoption('main','reposync-no-repopath', 'yes') not in disable
self.reposynctimeout = self.getoption('main','reposync-timeout', '90')
self.reposyncminrate = self.getoption('main','reposync-minrate', '250')
self.reposyncexcldebug = self.getoption('main', 'reposync-exclude-debug', 'yes') not in disable
self.reposyncnorepopath = self.getoption('main', 'reposync-no-repopath', 'yes') not in disable
self.reposynctimeout = self.getoption('main', 'reposync-timeout', '90')
self.reposyncminrate = self.getoption('main', 'reposync-minrate', '250')

self.rsyncbwlimit = self.getoption('main', 'rsync-bandwidth-limit', None)
self.rsynccleanup = self.getoption('main', 'rsync-cleanup', 'yes') not in disable
Expand Down Expand Up @@ -964,15 +964,15 @@ def mirrorreposync(url, path, reponame, dist):
reposync_conf_contents += "baseurl=%s\n" % url
reposync_conf_contents += "enabled=1\n"
if dist.sslca:
reposync_conf_contents += "sslcacert=%s\n" % dist.sslca
reposync_conf_contents += "sslcacert=%s\n" % dist.sslca
if dist.sslcert:
reposync_conf_contents += "sslclientcert=%s\n" % dist.sslcert
reposync_conf_contents += "sslclientcert=%s\n" % dist.sslcert
if dist.sslkey:
reposync_conf_contents += "sslclientkey=%s\n" % dist.sslkey
reposync_conf_contents += "sslclientkey=%s\n" % dist.sslkey
if cf.reposynctimeout:
reposync_conf_contents += "timeout=%s\n" % cf.reposynctimeout
reposync_conf_contents += "timeout=%s\n" % cf.reposynctimeout
if cf.reposyncminrate:
reposync_conf_contents += "minrate=%s\n" % cf.reposyncminrate
reposync_conf_contents += "minrate=%s\n" % cf.reposyncminrate


(fd, reposync_conf_file) = tempfile.mkstemp(text=True)
Expand Down
4 changes: 2 additions & 2 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_synciter2(self):
onlyleft = []
keyequal = []
# key is the first element
for a, b in mrepo.synciter(left, right, key = lambda x: x[0]):
for a, b in mrepo.synciter(left, right, key=lambda x: x[0]):
if a is None:
onlyright.append(b)
elif b is None:
Expand Down Expand Up @@ -125,7 +125,7 @@ def readlinks(self, directory):
"""return a list of (linkname, linktarget) tuples for all files in a directory"""
pj = os.path.join
readlink = os.readlink
result = [ (l, readlink(pj(directory, l))) for l in os.listdir(directory) ]
result = [(l, readlink(pj(directory, l))) for l in os.listdir(directory)]
result.sort()
return result

Expand Down
22 changes: 11 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
from distutils.core import setup

setup(
name = 'mrepo',
version = '0.8.4svn',
description = 'RPM repository mirroring tool',
author = 'Dag Wieers',
author_email ='[email protected]',
url = "http://dag.wieers.com/home-made/mrepo/",
name='mrepo',
version='0.8.4svn',
description='RPM repository mirroring tool',
author='Dag Wieers',
author_email='[email protected]',
url="http://dag.wieers.com/home-made/mrepo/",
scripts=['mrepo.py', 'gensystemid'],
data_files=[
('/etc', ['config/mrepo.conf']),
Expand All @@ -44,10 +44,10 @@
('/var/cache/mrepo', []),
('/var/www/mrepo', []),
],
download_url = 'http://dag.wieers.com/home-made/mrepo/mrepo-0.8.4svn.tar.gz',
license = 'GPL',
platforms = 'Posix',
classifiers = [
download_url='http://dag.wieers.com/home-made/mrepo/mrepo-0.8.4svn.tar.gz',
license='GPL',
platforms='Posix',
classifiers=[
'Internet :: WWW/HTTP :: Site Management',
'System :: Archiving :: Mirroring',
'System :: Archiving :: Packaging',
Expand All @@ -56,7 +56,7 @@
'System :: Software Distribution Tools',
'System :: Systems Administration',
],
long_description = '''
long_description='''
mrepo builds a local APT/Yum RPM repository from local ISO files, downloaded
updates, and extra packages from 3rd party repositories. It takes care of
setting up the ISO files, downloading the RPMs, configuring HTTP access, and
Expand Down
Loading