Changeset 2611

Show
Ignore:
Timestamp:
09/11/07 23:22:03 (1 year ago)
Author:
ensc
Message:

fixed patch and re-added lost hunk which caused broken paths for cachedir, logfile and friends

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/contrib/yum-3.2.4-chroot.patch

    r2609 r2611  
    7575     syslog_ident = Option() 
    7676     syslog_facility = Option('LOG_DAEMON') 
    77 @@ -615,7 +636,7 @@ def readMainConfig(startupconf): 
     77@@ -615,9 +636,9 @@ def readMainConfig(startupconf): 
    7878     yumconf.populate(startupconf._parser, 'main') 
    7979  
     
    8282+    for option in ('cachedir', 'logfile', 'persistdir', 'lockfile'): 
    8383         path = getattr(yumconf, option) 
    84          setattr(yumconf, option, yumconf.installroot + path) 
     84-        setattr(yumconf, option, yumconf.installroot + path) 
     85+        setattr(yumconf, option, yumconf.getRootedPath(path)) 
    8586      
     87     # Add in some extra attributes which aren't actually configuration values  
     88     yumconf.yumvar = yumvars 
    8689--- yum-3.2.4/docs/yum.conf.5.chroot 
    8790+++ yum-3.2.4/docs/yum.conf.5