backend/satellite_tools/xmlSource.py | 6 -
backend/server/rhnVirtualization.py | 1
client/tools/osad/src/jabber_lib.py | 9 --
client/tools/rhn-kickstart/rhnkickstart/lilo.py | 58 -------------------
client/tools/rhncfg/actions/Modes.py | 3
client/tools/rhncfg/config_common/Makefile | 2
client/tools/rhncfg/config_common/cfg_exceptions.py | 12 ---
client/tools/rhncfg/config_common/rhncfg_template.py | 43 --------------
client/tools/rhncfg/config_common/transactions.py | 1
client/tools/rhncfg/solaris/build-solaris.sh | 5 -
proxy/proxy/pm/rhn_package_manager.py | 5 -
11 files changed, 2 insertions(+), 143 deletions(-)
New commits:
commit 206be9e857baa2e59e2a35874ac7973c260fb487
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:20:32 2010 +0200
removed unused class rhnPackageManagerException
diff --git a/proxy/proxy/pm/rhn_package_manager.py
b/proxy/proxy/pm/rhn_package_manager.py
index 4a38e78..4c1ab13 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -255,11 +255,6 @@ def getPackagePath(nvrea, source=0, prepend=""):
release, pkgarch)
-class rhnPackageManagerException(Exception):
- """Custom exception class"""
- pass
-
-
if __name__ == '__main__':
try:
main()
commit 7fe7d9ce702e4286a0a893fc9a949ef1bcc65ce7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:20:12 2010 +0200
removed unused class WarningParseException
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 4d333ec..352eed8 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -66,12 +66,6 @@ class FatalParseException(SAXParseException):
"""
pass
-class WarningParseException(SAXParseException):
- """exception wrapper for a PyXML parser warning - probably not used.
- """
- pass
-
-
# XML Node
class Node:
def __init__(self, name, attributes=None, subelements=None):
commit 90169fb78bd609069c81ec53e126529d49c9fd92
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:19:04 2010 +0200
removed unused class VirtualizationListenerError
diff --git a/backend/server/rhnVirtualization.py b/backend/server/rhnVirtualization.py
index f6db269..5a4f743 100644
--- a/backend/server/rhnVirtualization.py
+++ b/backend/server/rhnVirtualization.py
@@ -106,7 +106,6 @@ CLIENT_SERVER_STATE_MAP = {
# VirtualizationEventError Class
###############################################################################
-class VirtualizationListenerError(Exception): pass
class VirtualizationEventError(Exception): pass
###############################################################################
commit 87b9deb301186ea371d846f1f96e71ee0e96233d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:17:58 2010 +0200
removed unused class RepoPlainFile
diff --git a/client/tools/rhncfg/config_common/cfg_exceptions.py
b/client/tools/rhncfg/config_common/cfg_exceptions.py
index 349a6b2..2c87118 100644
--- a/client/tools/rhncfg/config_common/cfg_exceptions.py
+++ b/client/tools/rhncfg/config_common/cfg_exceptions.py
@@ -28,9 +28,6 @@ class ConfigChannelAlreadyExistsError(Exception):
class ConfigChannelNotEmptyError(Exception):
pass
-class RepoPlainFile(Exception):
- pass
-
class ConfigNotManaged(Exception):
pass
commit 6eb9f7eb55ce5b2d1a83a03fe715e301c13beb4d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:17:39 2010 +0200
removed unused class RepoAlreadyExists
diff --git a/client/tools/rhncfg/config_common/cfg_exceptions.py
b/client/tools/rhncfg/config_common/cfg_exceptions.py
index 29f6105..349a6b2 100644
--- a/client/tools/rhncfg/config_common/cfg_exceptions.py
+++ b/client/tools/rhncfg/config_common/cfg_exceptions.py
@@ -28,9 +28,6 @@ class ConfigChannelAlreadyExistsError(Exception):
class ConfigChannelNotEmptyError(Exception):
pass
-class RepoAlreadyExists(Exception):
- pass
-
class RepoPlainFile(Exception):
pass
commit 6a2cee287b125c47d9df2ccf10091f24313781d0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:17:21 2010 +0200
removed unused class PathNotPresent
diff --git a/client/tools/rhncfg/actions/Modes.py b/client/tools/rhncfg/actions/Modes.py
index 1b0bbd9..d2fa51b 100644
--- a/client/tools/rhncfg/actions/Modes.py
+++ b/client/tools/rhncfg/actions/Modes.py
@@ -22,9 +22,6 @@ import string
True = 1
False = 0
-class PathNotPresent(Exception):
- pass
-
#Base class for all modes.
class BaseMode:
def __init__(self):
commit 17224f6abcb33207d17dc76c8d5942e0033fab5e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:16:59 2010 +0200
removed unused class MalformedRepository
diff --git a/client/tools/rhncfg/config_common/cfg_exceptions.py
b/client/tools/rhncfg/config_common/cfg_exceptions.py
index 19aefda..29f6105 100644
--- a/client/tools/rhncfg/config_common/cfg_exceptions.py
+++ b/client/tools/rhncfg/config_common/cfg_exceptions.py
@@ -19,9 +19,6 @@ class InvalidSession(Exception):
class AuthenticationError(Exception):
pass
-class MalformedRepository(Exception):
- pass
-
class ConfigChannelNotInRepo(Exception):
pass
commit ed189fce2e3545e72fb8f27390f78c257b9da580
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:16:36 2010 +0200
removed unused class LiloConfiguration
diff --git a/client/tools/rhn-kickstart/rhnkickstart/lilo.py
b/client/tools/rhn-kickstart/rhnkickstart/lilo.py
index 38a6398..649895d 100644
--- a/client/tools/rhn-kickstart/rhnkickstart/lilo.py
+++ b/client/tools/rhn-kickstart/rhnkickstart/lilo.py
@@ -242,64 +242,6 @@ class LiloConfigFile:
self.unsupported = []
-class LiloConfiguration:
- """Class used to represent the data in the lilo.conf lilo
configuration file."""
- def allowLiloLocationConfig(self, fstab):
- bootDevice = fstab.getBootDevice()
- if bootDevice[0:2] == "md":
- self.setDevice(("raid", bootDevice))
- return None
-
- return 1
-
- def setLiloImages(self, images):
- self.liloImages = images
-
-
- def setDevice(self, device):
- if (type(device) == type((1,))):
- self.liloDevice = device
- elif device != "mbr" and device != "partition" and device:
- raise ValueError, "device must be raid, mbr, partition, or None"
- self.liloDevice = device
-
- def setLinear(self, linear):
- self.liloLinear = linear
-
- def setAppend(self, append):
- self.liloAppend = append
-
- def setDefault(self, default):
- for (label, fsType) in self.liloImages.values():
- if label == default:
- self.default = default
- return
- raise IndexError, "unknown lilo label %s" % (default,)
-
- def getLinear(self):
- return self.liloLinear
-
- def getDevice(self):
- return self.liloDevice
-
- def getAppend(self):
- return self.liloAppend
-
- def __init__(self):
- self.liloImages = {}
- self.liloDevice = 'mbr'
- self.liloLinear = 1
- self.default = None
- self.initrdsMade = {}
- # XXX only i386 supports edd, nothing else should
- # instantiate this class
- if getArch() == "i386":
- import edd
- self.edd = edd.detect()
- else:
- self.edd = 0
-
-
def getArch ():
arch = os.uname ()[4]
if (len (arch) == 4 and arch[0] == 'i' and
commit c8fb37936d5a42b5c6d874300bb9373f73c452c0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:15:36 2010 +0200
removed unused class JabberCallback
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index a3e574c..0e88542 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -337,15 +337,6 @@ def sign(secret_key, *values):
h = hashlib.new('sha1', h + str(v)).hexdigest()
return h
-class JabberCallback:
- def __init__(self, stanza_id=None, stanza_ns=None):
- log_debug(4, stanza_id, stanza_ns)
- self.stanza_id = stanza_id
- self.stanza_ns = stanza_ns
-
- def callback(self, client, stanza):
- pass
-
# getAttr is braindead, rewrite it
class JabberProtocolNode(jabber.Protocol):
def getAttr(self, key):
commit adbd1efd361ea07b299aee00c6d4c8b2145a0bdc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:12:22 2010 +0200
removed unused class FileNotInRepo
diff --git a/client/tools/rhncfg/config_common/cfg_exceptions.py
b/client/tools/rhncfg/config_common/cfg_exceptions.py
index aaa8331..19aefda 100644
--- a/client/tools/rhncfg/config_common/cfg_exceptions.py
+++ b/client/tools/rhncfg/config_common/cfg_exceptions.py
@@ -22,9 +22,6 @@ class AuthenticationError(Exception):
class MalformedRepository(Exception):
pass
-class FileNotInRepo(Exception):
- pass
-
class ConfigChannelNotInRepo(Exception):
pass
commit 61c35d2e17c5fadb62ba91d2fc74387c1a5a9e9f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:06:01 2010 +0200
after ClientTemplatedDocument removal rhncfg_template.py is empty; removing
diff --git a/client/tools/rhncfg/config_common/Makefile
b/client/tools/rhncfg/config_common/Makefile
index 190675a..9853f76 100644
--- a/client/tools/rhncfg/config_common/Makefile
+++ b/client/tools/rhncfg/config_common/Makefile
@@ -10,7 +10,7 @@ SUBDIR = config_common
FILES = __init__ cfg_exceptions \
file_utils \
handler_base local_config \
- repository rhn_log rhn_main rhn_rpc rhncfg_template \
+ repository rhn_log rhn_main rhn_rpc \
up2date_config_parser utils transactions rpc_wrapper
diff --git a/client/tools/rhncfg/config_common/rhncfg_template.py
b/client/tools/rhncfg/config_common/rhncfg_template.py
deleted file mode 100644
index 3be091c..0000000
--- a/client/tools/rhncfg/config_common/rhncfg_template.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-_config_libs_path = '/var/www/rhns'
-import sys
-if _config_libs_path not in sys.path:
- sys.path.append(_config_libs_path)
-
-from config_libs import templated_document
-
diff --git a/client/tools/rhncfg/solaris/build-solaris.sh
b/client/tools/rhncfg/solaris/build-solaris.sh
index 5f40ad0..45d782f 100755
--- a/client/tools/rhncfg/solaris/build-solaris.sh
+++ b/client/tools/rhncfg/solaris/build-solaris.sh
@@ -33,9 +33,6 @@ cp -R actions temp_src/
cp -R config_* temp_src/
cd temp_src
-perl -pi -e "s|/var/www/rhns|$DEST_PREFIX/var/www/rhns|" \
- ./config_common/rhncfg_template.py
-
perl -pi -e "s|/usr/bin/diff|$DEST_PREFIX/bin/diff|" \
./config_client/rhncfgcli_diff.py \
./config_common/file_utils.py \
@@ -76,4 +73,4 @@ pkgmk -o -r $BUILD_ROOT -d /tmp -f Prototype
cd /tmp
# tar -cf - RHATrncfg | gzip -9 -c > RHATrncfg-1.0.sparc.pkg.tar.gz
-pkgtrans -s /tmp RHATrncfg-1.0.pkg RHATrncfg
\ No newline at end of file
+pkgtrans -s /tmp RHATrncfg-1.0.pkg RHATrncfg
commit 08a7a5c5a75b606e224afb411f59b2f16fd7e4b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:04:21 2010 +0200
removed unused class ClientTemplatedDocument
diff --git a/client/tools/rhncfg/config_common/rhncfg_template.py
b/client/tools/rhncfg/config_common/rhncfg_template.py
index f6e52ef..3be091c 100644
--- a/client/tools/rhncfg/config_common/rhncfg_template.py
+++ b/client/tools/rhncfg/config_common/rhncfg_template.py
@@ -20,24 +20,3 @@ if _config_libs_path not in sys.path:
from config_libs import templated_document
-class ClientTemplatedDocument(templated_document.TemplatedDocument):
- def set_functions(self):
- self.functions.clear()
- self.functions.update({
- 'hostname' : self.get_hostname,
- })
-
- def get_hostname(self):
- import socket
- return socket.gethostname()
-
- def call(self, fname, params, defval):
- if not self.functions.has_key(fname):
- if defval:
- return defval
- raise ValueError, "Cannot expand macro %s" % fname
- f = self.functions[fname]
- if params is None:
- params = ()
- return str(apply(f, params))
-
commit 0bccb3f3d1cf06cc047fc6bdec262b3427f457aa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 27 20:00:20 2010 +0200
removed unused class BackupFileMissing
diff --git a/client/tools/rhncfg/config_common/transactions.py
b/client/tools/rhncfg/config_common/transactions.py
index c84c4b8..1175578 100644
--- a/client/tools/rhncfg/config_common/transactions.py
+++ b/client/tools/rhncfg/config_common/transactions.py
@@ -28,7 +28,6 @@ from config_common.rhn_log import log_debug
class TargetNotFile(Exception): pass
class DuplicateDeployment(Exception): pass
-class BackupFileMissing(Exception): pass
class FailedRollback(Exception): pass
try: