summaryrefslogtreecommitdiffstats
path: root/yuminstall.py
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2009-03-11 16:34:37 -1000
committerDavid Cantrell <dcantrell@redhat.com>2009-03-11 16:34:37 -1000
commit730d89258c3a6ae7cfd3afec300440980081b415 (patch)
tree49182f8b185179b4f157f313a8b545b5c336a9e5 /yuminstall.py
parent78a6d26d2cc8b152efb9030faf2baf6089fb3ac0 (diff)
parentd08a9fd45b12f67d2fa96175d262d38da479bffd (diff)
downloadanaconda-730d89258c3a6ae7cfd3afec300440980081b415.tar.gz
anaconda-730d89258c3a6ae7cfd3afec300440980081b415.tar.xz
anaconda-730d89258c3a6ae7cfd3afec300440980081b415.zip
Merge branch 'master' into anaconda-storage-branch
* master: We also need to pack up the extra args tuple, too. doLoggingSetup keeps growing new arguments, so put them into a dict (#489709).
Diffstat (limited to 'yuminstall.py')
-rw-r--r--yuminstall.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/yuminstall.py b/yuminstall.py
index 9ce4883ee..dd272bf3c 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -575,8 +575,7 @@ class AnacondaYum(YumSorter):
YumSorter.getReposFromConfig(self)
# Override this method so yum doesn't nuke our existing logging config.
- def doLoggingSetup(self, debuglevel, errorlevel, syslog_indent=None,
- syslog_facility=None):
+ def doLoggingSetup(self, *args, **kwargs):
pass
def doConfigSetup(self, fn='/tmp/anaconda-yum.conf', root='/'):