extras-buildsys/utils/pushscript Config_Extras.py, 1.2, 1.3 RepoBuild.py, 1.1, 1.2

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17753

Modified Files:
	Config_Extras.py RepoBuild.py 
Log Message:
merge Ville's linkdict


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Config_Extras.py	29 Sep 2006 16:20:47 -0000	1.2
+++ Config_Extras.py	29 Sep 2006 23:53:41 -0000	1.3
@@ -70,6 +70,9 @@
                        'development': "'/\([^/]\+-\)\?kmod-'",
                        }
 
+# repository symlinks to remove/create since they confuse createrepo
+repobuild_linkdict = {}
+
 sync_cmd = 'extras-sync'
 
 createrepo = '/usr/bin/createrepo'


Index: RepoBuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoBuild.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepoBuild.py	29 Sep 2006 16:14:14 -0000	1.1
+++ RepoBuild.py	29 Sep 2006 23:53:41 -0000	1.2
@@ -24,9 +24,22 @@
         sys.exit(errno.EINVAL)
 
     Utils.create_src_repo(cfg,dist)  # source rpms
+
+    # get rid of symlinks that are in the way (of createrepo)
+    for link in cfg.repobuild_linkdict.get(dist) or []:
+        flink = os.path.join(cfg.treedir, dist, link)
+        if os.path.exists(flink):
+            os.unlink(flink)
+
     for arch in cfg.archdict[dist]:
         Utils.create_arch_repo(cfg,dist,arch)  # binary+debuginfo rpms
 
+    # recreate symlinks
+    for link in cfg.repobuild_linkdict.get(dist) or []:
+        flink = os.path.join(cfg.treedir, dist, link)
+        if not os.path.exists(flink):
+            os.symlink(cfg.repobuild_linkdict[dist][link], flink)
+
 
 if __name__ == '__main__':
     if len(sys.argv) < 3: