Skipped content of type multipart/alternative-------------- next part -------------- Only in yum-2.0.6-new/bin: Makefile diff -r --exclude '*~' --exclude '*po' -u yum-2.0.6.orig/clientStuff.py yum-2.0.6-new/clientStuff.py --- yum-2.0.6.orig/clientStuff.py 2004-03-16 20:16:38.000000000 -0800 +++ yum-2.0.6-new/clientStuff.py 2004-03-26 10:06:29.000000000 -0800 @@ -36,6 +36,9 @@ from i18n import _ +def set_user_agent(str): + urlgrabber.set_user_agent(str) + def stripENVRA(str): archIndex = string.rfind(str, '.') arch = str[archIndex+1:] Only in yum-2.0.6-new: config.log diff -r --exclude '*~' --exclude '*po' -u yum-2.0.6.orig/config.py yum-2.0.6-new/config.py --- yum-2.0.6.orig/config.py 2004-03-16 20:16:38.000000000 -0800 +++ yum-2.0.6-new/config.py 2004-03-26 10:47:49.000000000 -0800 @@ -102,6 +102,7 @@ 'kernel-source', 'kernel-modules-unsupported'] self.kernelpkgnames = ['kernel','kernel-smp','kernel-enterprise', 'kernel-bigmem','kernel-BOOT'] + self.useragentstring = None if self._getoption('main','cachedir') != None: self.cachedir = self._getoption('main','cachedir') @@ -149,6 +150,8 @@ self.cachedb = self._getoption('main', 'cachedb') if self._getoption('main', 'usecachedb') != None: self.usecachedb = self.cfg.getboolean('main', 'usecachedb') + if self._getoption('main', 'useragentstring') != None: + self.useragentstring = self._getoption('main', 'useragentstring') # figure out what the releasever really is from the distroverpkg Only in yum-2.0.6-new: config.status Only in yum-2.0.6-new: debugfiles.list Only in yum-2.0.6-new: debugsources.list Only in yum-2.0.6-new/docs: Makefile diff -r --exclude '*~' --exclude '*po' -u yum-2.0.6.orig/docs/yum.conf.5 yum-2.0.6-new/docs/yum.conf.5 --- yum-2.0.6.orig/docs/yum.conf.5 2004-03-16 20:16:39.000000000 -0800 +++ yum-2.0.6-new/docs/yum.conf.5 2004-03-26 10:06:36.000000000 -0800 @@ -117,6 +117,10 @@ path to complete rpmdb for your distro - typically contained in the rpmdb-yourdistro package. defaults to /usr/lib/rpmdb/$basearch-redhat-linux/redhat/ +.IP \fBuseragentstring \fR +User agent string to use for http[s] download. This allows operation +with highly restrictive proxies. defaults to "Yum/2.X" + .SH "[server] options" .LP Only in yum-2.0.6-new/etc: Makefile Only in yum-2.0.6-new: Makefile Only in yum-2.0.6-new: yum.lang diff -r --exclude '*~' --exclude '*po' -u yum-2.0.6.orig/yummain.py yum-2.0.6-new/yummain.py --- yum-2.0.6.orig/yummain.py 2004-03-16 20:16:39.000000000 -0800 +++ yum-2.0.6-new/yummain.py 2004-03-26 10:06:42.000000000 -0800 @@ -229,6 +229,9 @@ serverlist = conf.servers serverlist.sort() + if conf.useragentstring: + clientStuff.set_user_agent(conf.useragentstring) + # get the package info file clientStuff.get_package_info_from_servers(serverlist, HeaderInfo)