From: Enrico Scholz Date: Thu, 6 Sep 2007 07:53:46 +0000 (+0000) Subject: added patch for yum-3.2.4 X-Git-Tag: release-0.30.215~97 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?p=util-vserver.git;a=commitdiff_plain;h=39355cb9aedfca000085067a27371a500bd2e8dd added patch for yum-3.2.4 git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2609 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/contrib/Makefile-files b/contrib/Makefile-files index 976e01d..aafacf2 100644 --- a/contrib/Makefile-files +++ b/contrib/Makefile-files @@ -36,6 +36,7 @@ EXTRA_DIST += $(contrib_subst_SRCS) \ contrib/yum-3.0.5-chroot.patch \ contrib/yum-3.2.0-chroot.patch \ contrib/yum-3.2.1-chroot.patch \ + contrib/yum-3.2.4-chroot.patch \ contrib/make-manifest contrib/manifest.dat: contrib/.manifest.dat.pathsubst.stamp diff --git a/contrib/yum-3.2.4-chroot.patch b/contrib/yum-3.2.4-chroot.patch new file mode 100644 index 0000000..5900cb3 --- /dev/null +++ b/contrib/yum-3.2.4-chroot.patch @@ -0,0 +1,155 @@ +--- yum-3.2.4/yum/__init__.py.chroot ++++ yum-3.2.4/yum/__init__.py +@@ -214,8 +214,7 @@ class YumBase(depsolve.Depsolve): + repo_config_age = self.conf.config_file_age + + for reposdir in self.conf.reposdir: +- if os.path.exists(self.conf.installroot+'/'+reposdir): +- reposdir = self.conf.installroot + '/' + reposdir ++ reposdir = self.conf.getRootedPath(reposdir) + + if os.path.isdir(reposdir): + for repofn in glob.glob('%s/*.repo' % reposdir): +@@ -664,11 +663,9 @@ class YumBase(depsolve.Depsolve): + # if we're not root then we don't lock - just return nicely + if self.conf.uid != 0: + return +- +- root = self.conf.installroot +- lockfile = root + '/' + lockfile # lock in the chroot +- lockfile = os.path.normpath(lockfile) # get rid of silly preceding extra / +- ++ ++ lockfile = self.conf.lockfile ++ + mypid=str(os.getpid()) + while not self._lock(lockfile, mypid, 0644): + fd = open(lockfile, 'r') +@@ -700,9 +697,8 @@ class YumBase(depsolve.Depsolve): + if self.conf.uid != 0: + return + +- root = self.conf.installroot +- lockfile = root + '/' + lockfile # lock in the chroot +- ++ lockfile=self.conf.lockfile ++ + self._unlock(lockfile) + + def _lock(self, filename, contents='', mode=0777): +--- yum-3.2.4/yum/config.py.chroot ++++ yum-3.2.4/yum/config.py +@@ -469,6 +469,26 @@ class StartupConf(BaseConfig): + pluginpath = ListOption(['/usr/share/yum-plugins', '/usr/lib/yum-plugins']) + pluginconfpath = ListOption(['/etc/yum/pluginconf.d']) + ++ def getRootedPath(self, path, enforce_default=False, defaults_to_host=False): ++ instroot = getattr(self, 'installroot', None) ++ if instroot==None: ++ return path ++ ++ if path.startswith('hostfs://'): res = path[9:] ++ elif path.startswith('chrootfs://'): res = instroot + '/' + path[11:] ++ else: ++ tmp = instroot + '/' + path ++ ++ if enforce_default: ++ if defaults_to_host: res = path ++ else: res = tmp ++ else: ++ if os.path.exists(tmp): res = tmp ++ elif defaults_to_host: res = path ++ else: res = tmp ++ ++ return res ++ + class YumConf(StartupConf): + ''' + Configuration option definitions for yum.conf\'s [main] section. +@@ -482,6 +502,7 @@ class YumConf(StartupConf): + persistdir = Option('/var/lib/yum') + keepcache = BoolOption(True) + logfile = Option('/var/log/yum.log') ++ lockfile = Option('/var/run/yum.pid') + reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d']) + syslog_ident = Option() + syslog_facility = Option('LOG_DAEMON') +@@ -615,7 +636,7 @@ def readMainConfig(startupconf): + yumconf.populate(startupconf._parser, 'main') + + # Apply the installroot to directory options +- for option in ('cachedir', 'logfile', 'persistdir'): ++ for option in ('cachedir', 'logfile', 'persistdir', 'lockfile'): + path = getattr(yumconf, option) + setattr(yumconf, option, yumconf.installroot + path) + +--- yum-3.2.4/docs/yum.conf.5.chroot ++++ yum-3.2.4/docs/yum.conf.5 +@@ -23,8 +23,10 @@ The [main] section must exist for yum to + following options: + + .IP \fBcachedir\fR +-Directory where yum should store its cache and db files. The default is +-`/var/cache/yum'. ++Directory where yum should store its cache and db files. The default ++is `/var/cache/yum'. Unless the prefixes `hostfs://' or `chrootfs://' ++are used, some magic will be applied to determine the real path in ++combination with `--installroot'. + + .IP \fBpersistdir\fR + Directory where yum should store information that should persist over multiple +@@ -44,6 +46,10 @@ documented in \fB[repository] options\fR + repositories defined in /etc/yum/yum.conf to form the complete set of + repositories that yum will use. + ++Unless the prefixes `hostfs://' or `chrootfs://' are used, some magic ++will be applied to determine the real path in combination with ++`--installroot'. ++ + .IP \fBdebuglevel\fR + Debug message output level. Practical range is 0\-10. Default is `2'. + +@@ -51,7 +57,10 @@ Debug message output level. Practical ra + Error message output level. Practical range is 0\-10. Default is `2'. + + .IP \fBlogfile\fR +-Full directory and file name for where yum should write its log file. ++Full directory and file name for where yum should write its log ++file. Unless the prefixes `hostfs://' or `chrootfs://' are used, ++some magic will be applied to determine the real path in combination ++with `--installroot'. + + .IP \fBgpgcheck\fR + Either `1' or `0'. This tells yum whether or not it should perform a GPG +--- yum-3.2.4/cli.py.chroot ++++ yum-3.2.4/cli.py +@@ -1204,13 +1204,14 @@ class YumOptionParser(OptionParser): + def getRoot(self,opts): + # If the conf file is inside the installroot - use that. + # otherwise look for it in the normal root ++ if opts.conffile==None: ++ opts.conffile = '/etc/yum/yum.conf' ++ if opts.installroot: ++ if os.access(opts.installroot+opts.conffile, os.R_OK): ++ opts.conffile = opts.installroot+opts.conffile ++ elif os.access(opts.installroot+'/etc/yum.conf', os.R_OK): ++ opts.conffile = opts.installroot+'/etc/yum.conf' + if opts.installroot: +- if os.access(opts.installroot+'/'+opts.conffile, os.R_OK): +- opts.conffile = opts.installroot+'/'+opts.conffile +- elif opts.conffile == '/etc/yum/yum.conf': +- # check if /installroot/etc/yum.conf exists. +- if os.access(opts.installroot+'/etc/yum.conf', os.R_OK): +- opts.conffile = opts.installroot+'/etc/yum.conf' + root=opts.installroot + else: + root = '/' +@@ -1231,7 +1232,7 @@ class YumOptionParser(OptionParser): + help="be tolerant of errors") + self.add_option("-C", dest="cacheonly", action="store_true", + help="run entirely from cache, don't update cache") +- self.add_option("-c", dest="conffile", default='/etc/yum/yum.conf', ++ self.add_option("-c", dest="conffile", default=None, + help="config file location", metavar=' [config file]') + self.add_option("-R", dest="sleeptime", type='int', default=None, + help="maximum command wait time", metavar=' [minutes]')