X-Git-Url: http://git.onelab.eu/?p=yum.git;a=blobdiff_plain;f=yum-3.2.27-chroot.patch;fp=yum-3.2.25-chroot.patch;h=c118f4eacd0bffc4ad4289b524f350b24e10a2b6;hp=236f14fac1bd6b56db3f0c95c0c5e6e658caf2e2;hb=f7a98323743004d032be00e011cfdf9d323b847b;hpb=e0980739a9f5124d1dc2819508242401d47dff72

diff --git a/yum-3.2.25-chroot.patch b/yum-3.2.27-chroot.patch
similarity index 72%
rename from yum-3.2.25-chroot.patch
rename to yum-3.2.27-chroot.patch
index 236f14f..c118f4e 100644
--- a/yum-3.2.25-chroot.patch
+++ b/yum-3.2.27-chroot.patch
@@ -1,7 +1,7 @@
-diff -ur yum-3.2.25.orig/cli.py yum-3.2.25/cli.py
---- yum-3.2.25.orig/cli.py	2009-12-14 15:33:38.708870457 +0100
-+++ yum-3.2.25/cli.py	2009-12-14 15:34:58.904693320 +0100
-@@ -1257,13 +1257,14 @@
+diff -ur yum-3.2.27.orig/cli.py yum-3.2.27/cli.py
+--- yum-3.2.27.orig/cli.py	2010-03-03 20:09:36.000000000 -0500
++++ yum-3.2.27/cli.py	2010-03-23 16:24:21.313420546 -0400
+@@ -1278,13 +1278,15 @@
      def getRoot(self,opts):
          # If the conf file is inside the  installroot - use that.
          # otherwise look for it in the normal root
@@ -12,6 +12,7 @@ diff -ur yum-3.2.25.orig/cli.py yum-3.2.25/cli.py
 +                    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
@@ -22,23 +23,23 @@ diff -ur yum-3.2.25.orig/cli.py yum-3.2.25/cli.py
              root=opts.installroot
          else:
              root = '/'
-@@ -1302,7 +1303,7 @@
-                 help=_("be tolerant of errors"))
-         group.add_option("-C", dest="cacheonly", action="store_true",
-                 help=_("run entirely from cache, don't update cache"))
--        group.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
-+        group.add_option("-c", dest="conffile", default=None,
-                 help=_("config file location"), metavar=' [config file]')
-         group.add_option("-R", dest="sleeptime", type='int', default=None,
-                 help=_("maximum command wait time"), metavar=' [minutes]')
-diff -ur yum-3.2.25.orig/yum/config.py yum-3.2.25/yum/config.py
---- yum-3.2.25.orig/yum/config.py	2009-12-14 15:33:38.711856129 +0100
-+++ yum-3.2.25/yum/config.py	2009-12-14 15:39:44.204522759 +0100
-@@ -600,6 +600,29 @@
+@@ -1325,7 +1327,7 @@
+                 action="store_true",
+                 help=_("run entirely from system cache, don't update cache"))
+         group.add_option("-c", "--config", dest="conffile",
+-                default='/etc/yum/yum.conf',
++                default='None',
+                 help=_("config file location"), metavar='[config file]')
+         group.add_option("-R", "--randomwait", dest="sleeptime", type='int',
+                 default=None,
+diff -ur yum-3.2.27.orig/yum/config.py yum-3.2.27/yum/config.py
+--- yum-3.2.27.orig/yum/config.py	2010-03-23 16:13:48.022914313 -0400
++++ yum-3.2.27/yum/config.py	2010-03-23 16:26:57.116806313 -0400
+@@ -603,7 +603,27 @@
      syslog_ident = Option()
      syslog_facility = Option('LOG_DAEMON')
- 
-+
+     persistdir = Option('/var/lib/yum')
+-    
 +
 +    def getRootedPath(self, path, enforce_default=False, defaults_to_host=False):
 +        instroot = self.installroot
@@ -59,20 +60,19 @@ diff -ur yum-3.2.25.orig/yum/config.py yum-3.2.25/yum/config.py
 +                else:                   res = tmp
 +
 +        return res
-+
-+
++ 
  class YumConf(StartupConf):
      '''
      Configuration option definitions for yum.conf\'s [main] section.
-@@ -613,6 +636,7 @@
-     persistdir = Option('/var/lib/yum')
+@@ -617,6 +637,7 @@
+ 
      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'])
  
      commands = ListOption()
-@@ -827,9 +851,9 @@
+@@ -859,9 +880,9 @@
      yumconf.populate(startupconf._parser, 'main')
  
      # Apply the installroot to directory options
@@ -84,28 +84,29 @@ diff -ur yum-3.2.25.orig/yum/config.py yum-3.2.25/yum/config.py
          ir_path = ir_path.replace('//', '/') # os.path.normpath won't fix this and
                                               # it annoys me
          ir_path = varReplace(ir_path, yumvars)
-diff -ur yum-3.2.25.orig/yum/__init__.py yum-3.2.25/yum/__init__.py
---- yum-3.2.25.orig/yum/__init__.py	2009-12-14 15:33:38.711856129 +0100
-+++ yum-3.2.25/yum/__init__.py	2009-12-14 15:36:05.306160196 +0100
-@@ -386,8 +386,7 @@
+diff -ur yum-3.2.27.orig/yum/__init__.py yum-3.2.27/yum/__init__.py
+--- yum-3.2.27.orig/yum/__init__.py	2010-03-18 12:28:57.000000000 -0400
++++ yum-3.2.27/yum/__init__.py	2010-03-23 16:27:43.617623958 -0400
+@@ -398,8 +398,7 @@
              # this check makes sure that our dirs exist properly.
              # if they aren't in the installroot then don't prepend the installroot path
              # if we don't do this then anaconda likes to not  work.
 -            if os.path.exists(self.conf.installroot+'/'+reposdir):
 -                reposdir = self.conf.installroot + '/' + reposdir
-+            reposdir = self.conf.getRootedPath(reposdir)
++            reposdir = self.conf.getRootedPath(reposdir)            
  
              if os.path.isdir(reposdir):
                  for repofn in sorted(glob.glob('%s/*.repo' % reposdir)):
-@@ -1266,9 +1265,8 @@
+@@ -1377,10 +1376,8 @@
+         if self.conf.uid != 0:
              return
              
-         root = self.conf.installroot
+-        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')