extras-buildsys/utils/pushscript RepoBuild.py,1.6,1.7

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15982

Modified Files:
	RepoBuild.py 
Log Message:
- retrieve default/customised repo root path
- handle dangling symlinks (this optional stuff is not used anywhere anymore, I think)



Index: RepoBuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoBuild.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RepoBuild.py	6 Nov 2008 12:17:50 -0000	1.6
+++ RepoBuild.py	7 Nov 2008 15:26:50 -0000	1.7
@@ -24,8 +24,8 @@
     if hasattr(cfg,'repobuild_linkdict'):
         # get rid of symlinks that are in the way (of createrepo)
         for link in cfg.repobuild_linkdict.get(dist) or []:
-            flink = os.path.join(reporoot, link)
-            if os.path.exists(flink):
+            flink = os.path.join( Utils.get_reporoot(cfg,dist), link)
+            if os.path.islink(flink):
                 os.unlink(flink)
 
     srpmspath = Utils.srpm_repodir(cfg,dist)
@@ -38,7 +38,7 @@
     if hasattr(cfg,'repobuild_linkdict'):
         # recreate symlinks
         for link in cfg.repobuild_linkdict.get(dist) or []:
-            flink = os.path.join(cfg.treedir, dist, link)
+            flink = os.path.join( Utils.get_reporoot(cfg,dist), link)
             if not os.path.exists(flink):
                 os.symlink(cfg.repobuild_linkdict[dist][link], flink)