From c314861606904f710b312a1b44322da21aab51e8 Mon Sep 17 00:00:00 2001
From: kanzure <kanzure@gmail.com>
Date: Tue, 1 Dec 2009 15:00:26 -0600
Subject: more improvements on repo-recover.py
---
import_tools/del_repo/repo-recover.py | 18 ++++++++++++++----
import_tools/del_repo/repo_to_yaml.py | 15 ++++++++++++---
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/import_tools/del_repo/repo-recover.py b/import_tools/del_repo/repo-recover.py
index 6543b49..fe67524 100644
--- a/import_tools/del_repo/repo-recover.py
+++ b/import_tools/del_repo/repo-recover.py
@@ -40,6 +40,7 @@ from copy import copy, deepcopy
#for .repo file parsing
from xml.dom import minidom
+from repo_to_yaml import repo_to_yaml
bryan_message = "bryan hasn't got that far yet"
@@ -342,24 +343,33 @@ def repo_recover(cfg=None, fs=None, delrepo=None, instances="instances/", compon
#######################################
+ i = 0
#i think this is broken
#step 3) yaml skdb package output -- convert to skdb-ish representations
- for a_repo in delrepo:
+ for cfg in loaded_cfg:
+ #find the corresponding .repo file
+ corresponding_repo_file = delrepo[i]
+ a_repo = corresponding_repo_file
+
if debug: print "converting .repo into a yaml representation"
resulting_yaml = repo_to_yaml(repo=a_repo)
+ if debug: print "done converting .repo into a yaml representation"
base_name = os.path.basename(a_repo)
- base_name_scrubbed = basename[:-5] #get rid of the .repo at the end of the filename
+ if debug: print "base_name is: ", base_name
+ base_name_scrubbed = base_name[:-5] #get rid of the .repo at the end of the filename
+ if debug: print "base_name_scrubbed is: ", base_name_scrubbed
- pkg_path = os.path.join(instances, base_name_scrubbed)
+ #pkg_path = os.path.join(instances, base_name_scrubbed)
+ pkg_path = os.path.join(instances, sanitize(cfg.name))
yaml_file_path = os.path.join(pkg_path, base_name_scrubbed + ".repo.yaml")
file_handler = open(yaml_file_path, "w")
file_handler.write(resulting_yaml)
file_handler.close()
+ i = i + 1
if debug: "repo_recover: ending"
- return
if __name__ == "__main__":
optfunc.run(repo_recover)
diff --git a/import_tools/del_repo/repo_to_yaml.py b/import_tools/del_repo/repo_to_yaml.py
index 5f714c0..2348e57 100644
--- a/import_tools/del_repo/repo_to_yaml.py
+++ b/import_tools/del_repo/repo_to_yaml.py
@@ -1,7 +1,8 @@
#!/usr/bin/python
#python repo-to-yaml.py roomba.repo.xml > roomba.yaml
-import sys
+import sys, os
import yaml
+import optfunc
from xml.dom import minidom
def determine_key_name(results, node_name):
@@ -50,6 +51,11 @@ def parse_file(file):
# artifact = process_artifact(node)
# artifacts.append(artifact)
+def parse_repo(repo):
+ system = repo.childNodes[0].nextSibling.childNodes[1]
+ huge_thing = process_node(system)
+ return huge_thing
+
def main():
rval = {}
if len(sys.argv)>1 and sys.argv[1] == '-':
@@ -60,6 +66,9 @@ def main():
print yaml.dump(rval, default_flow_style=False)
return rval
-if __name__ == "__main__":
- main()
+def repo_to_yaml(repo):
+ repo_path = os.path.abspath(repo)
+ return yaml.dump(parse_file(repo_path))
+if __name__ == "__main__":
+ optfunc.run(repo_to_yaml)
--
cgit v1.2.3