particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove changes not relevant to cli

Browse source
This commit is contained in:
Tomas Kopecek 2017-05-12 11:23:10 +02:00
parent d2ab86584a
commit d625c0aa4d
33 changed files with 359 additions and 420 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/builder/runroot.py
View file

@ -1,9 +1,8 @@
# kojid plugin
from __future__ import absolute_import
import commands
import koji
import six.moves.configparser
import ConfigParser
import os
import platform
compat_mode = False
@ -57,7 +56,7 @@ class RunRootTask(tasks.BaseTaskHandler):
return res
def _read_config(self):
cp = six.moves.configparser.SafeConfigParser()
cp = ConfigParser.SafeConfigParser()
cp.read(CONFIG_FILE)
self.config = {
'default_mounts': [],
@ -85,7 +84,7 @@ class RunRootTask(tasks.BaseTaskHandler):
'fstype': cp.get(section_name, 'fstype'),
'options': cp.get(section_name, 'options'),
})
except six.moves.configparser.NoOptionError:
except ConfigParser.NoOptionError:
raise koji.GenericError("bad config: missing options in %s section" % section_name)
count += 1

5
plugins/builder/save_failed_tree.py
View file

@ -1,9 +1,8 @@
from __future__ import absolute_import
import fnmatch
import os
import sys
import tarfile
import six.moves.configparser
import ConfigParser
import koji
import koji.tasks as tasks
@ -28,7 +27,7 @@ def omit_paths3(tarinfo):
def read_config():
global config
cp = six.moves.configparser.SafeConfigParser()
cp = ConfigParser.SafeConfigParser()
cp.read(CONFIG_FILE)
config = {
'path_filters': [],

3
plugins/hub/echo.py
View file

@ -5,11 +5,10 @@
# Authors:
# Mike Bonnet <mikeb@redhat.com>
from __future__ import absolute_import
from koji.plugin import callbacks, callback, ignore_error
import logging
@callback(*list(callbacks.keys()))
@callback(*callbacks.keys())
@ignore_error
def echo(cbtype, *args, **kws):
logging.getLogger('koji.plugin.echo').info('Called the %s callback, args: %s; kws: %s',

5
plugins/hub/messagebus.py
View file

@ -4,10 +4,9 @@
# Authors:
# Mike Bonnet <mikeb@redhat.com>
from __future__ import absolute_import
from koji import PluginError
from koji.plugin import callbacks, callback, ignore_error
import six.moves.configparser
import ConfigParser
import logging
import qpid.messaging
import qpid.messaging.transports
@ -79,7 +78,7 @@ def get_sender():
session = None
target = None
config = six.moves.configparser.SafeConfigParser()
config = ConfigParser.SafeConfigParser()
config.read(CONFIG_FILE)
if not config.has_option('broker', 'timeout'):
config.set('broker', 'timeout', '60')

5
plugins/hub/protonmsg.py
View file

@ -5,11 +5,10 @@
# Authors:
# Mike Bonnet <mikeb@redhat.com>
from __future__ import absolute_import
import koji
from koji.plugin import callback, ignore_error
from koji.context import context
import six.moves.configparser
import ConfigParser
import logging
import json
import random
@ -247,7 +246,7 @@ def send_queued_msgs(cbtype, *args, **kws):
log = logging.getLogger('koji.plugin.protonmsg')
global CONFIG
if not CONFIG:
conf = six.moves.configparser.SafeConfigParser()
conf = ConfigParser.SafeConfigParser()
with open(CONFIG_FILE) as conffile:
conf.readfp(conffile)
CONFIG = conf

7
plugins/hub/rpm2maven.py
View file

@ -5,11 +5,10 @@
# Authors:
# Mike Bonnet <mikeb@redhat.com>
from __future__ import absolute_import
import koji
from koji.context import context
from koji.plugin import callback
import six.moves.configparser
import ConfigParser
import fnmatch
import os
import shutil
@ -31,7 +30,7 @@ def maven_import(cbtype, *args, **kws):
filepath = kws['filepath']
if not config:
config = six.moves.configparser.SafeConfigParser()
config = ConfigParser.SafeConfigParser()
config.read(CONFIG_FILE)
name_patterns = config.get('patterns', 'rpm_names').split()
for pattern in name_patterns:
@ -52,7 +51,7 @@ def maven_import(cbtype, *args, **kws):
shutil.rmtree(tmpdir)
def expand_rpm(filepath, tmpdir):
devnull = open('/dev/null', 'r+')
devnull = file('/dev/null', 'r+')
rpm2cpio = subprocess.Popen(['/usr/bin/rpm2cpio', filepath],
stdout=subprocess.PIPE,
stdin=devnull, stderr=devnull,

1
plugins/hub/runroot_hub.py
View file

@ -3,7 +3,6 @@
# plugin has a config file. This hub plugin has no config file.
from __future__ import absolute_import
from koji.context import context
from koji.plugin import export
import koji

5
plugins/hub/save_failed_tree.py
View file

@ -1,6 +1,5 @@
from __future__ import absolute_import
import sys
import six.moves.configparser
import ConfigParser
import koji
from koji.context import context
from koji.plugin import export
@ -29,7 +28,7 @@ def saveFailedTree(buildrootID, full=False, **opts):
# read configuration only once
if config is None:
config = six.moves.configparser.SafeConfigParser()
config = ConfigParser.SafeConfigParser()
config.read(CONFIG_FILE)
allowed_methods = config.get('permissions', 'allowed_methods').split()
if len(allowed_methods) == 1 and allowed_methods[0] == '*':