SOURCES: yum-chroot.patch - 3.2.19

[patrys]

Author: patrys                       Date: Mon Sep  1 00:17:09 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 3.2.19

---- Files affected:
SOURCES:
   yum-chroot.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/yum-chroot.patch
diff -u SOURCES/yum-chroot.patch:1.7 SOURCES/yum-chroot.patch:1.8
--- SOURCES/yum-chroot.patch:1.7	Mon Mar 10 23:04:43 2008
+++ SOURCES/yum-chroot.patch	Mon Sep  1 02:17:03 2008
@@ -10,22 +10,30 @@
  
              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
+@@ -664,8 +663,7 @@ class YumBase(depsolve.Depsolve):
          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
-+
+         lockfile = os.path.normpath(lockfile) # get rid of silly preceding extra /
+         
          mypid=str(os.getpid())    
-         while not self._lock(lockfile, mypid, 0644):
-             fd = open(lockfile, 'r')
-@@ -700,9 +697,8 @@ class YumBase(depsolve.Depsolve):
+@@ -700,8 +697,7 @@ class YumBase(depsolve.Depsolve):
+             return
+         
+         if lockfile is not None:
+-            root = self.conf.installroot
+-            lockfile = root + '/' + lockfile # lock in the chroot
++            lockfile = self.conf.lockfile
+         elif self._lockfile is None:
+             return # Don't delete other people's lock files on __del__
+         else:
+
+
+
+
          if self.conf.uid != 0:
              return
          
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/yum-chroot.patch?r1=1.7&r2=1.8&f=u