Skip to content
Closed
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
5 changes: 1 addition & 4 deletions src/zypper_plugins/package_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

from os import readlink, getppid, environ
from os.path import basename
import sys
import logging

from katello.packages import upload_package_profile

from zypp_plugin import Plugin


class KatelloZyppPlugin(Plugin):

def __init__(self):
Expand All @@ -30,7 +30,6 @@ def __init__(self):
self.cleanup = "number"
self.userdata = {}


def parse_userdata(self, s):
userdata = {}
for kv in s.split(","):
Expand All @@ -41,7 +40,6 @@ def parse_userdata(self, s):
userdata[k] = v.strip()
return userdata


def get_userdata(self, headers):
try:
return self.parse_userdata(headers['userdata'])
Expand All @@ -51,7 +49,6 @@ def get_userdata(self, headers):
logging.error("invalid userdata")
return {}


def PLUGINBEGIN(self, headers, body):
self.description = "zypp(%s)" % basename(readlink("/proc/%d/exe" % getppid()))
self.userdata = self.get_userdata(headers)
Expand Down
4 changes: 1 addition & 3 deletions test/test_katello/test_tracer/test_deb.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
has_needrestart,
use_flag,
use_needrestart,
use_needrestart,
AptTracerApp,
collect_apps
)
import subprocess
import sys

from mock import patch, Mock
from mock import patch


class TestNeedrestart(unittest.TestCase):
Expand Down