ChangeLog | 12 ++++++++++++
dorrie/comps/parse.py | 21 ++++++++++++---------
2 files changed, 24 insertions(+), 9 deletions(-)
New commits:
commit f97a31783ebee67ad92aafc9f33b492ee2ca4a1a
Author: Shreyank Gupta <sgupta(a)redhat.com>
Date: Fri Jun 25 23:32:47 2010 +0530
/tmp check + ChangeLog
diff --git a/ChangeLog b/ChangeLog
index ba4d619..195016d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-25 Shreyank Gupta <sgupta(a)redhat.com>
+
+ * .gitignore: New file.
+
+ * INSTALL: Added new dependency. Removed APP_ROOT config.
+
+ * dorrie/comps/media/cache: Removed.
+
+ * dorrie/comps/parse.py (build_ks): Empty REPO, tmp check.
+
+ * dorrie/settimgs.py (CACHE): Default value /tmp
+
2010-04-13 Shreyank Gupta <sgupta(a)redhat.com>
* dorrie/comps/media/dorrie.fedora.css,
diff --git a/dorrie/comps/parse.py b/dorrie/comps/parse.py
index 1789e45..10440fd 100644
--- a/dorrie/comps/parse.py
+++ b/dorrie/comps/parse.py
@@ -180,15 +180,16 @@ def build_ks(id):
ksparser.handler.packages.packageList.extend(pplus)
ksparser.handler.packages.excludedList.extend(pminus)
- #Change mirrorlist repo to the local one
- repolist = ksparser.handler.repo.repoList
- released = os.path.join(settings.REPO, 'fedora/Packages/')
- updates = os.path.join(settings.REPO, 'updates/')
- for repo in repolist:
- if repo.name == 'released':
- repo.baseurl = 'file://%s' % released
- elif repo.name == 'updates':
- repo.baseurl = 'file://%s' % updates
+ if settings.REPO:
+ #Change mirrorlist repo to the local one
+ repolist = ksparser.handler.repo.repoList
+ released = os.path.join(settings.REPO, 'fedora/Packages/')
+ updates = os.path.join(settings.REPO, 'updates/')
+ for repo in repolist:
+ if repo.name == 'released':
+ repo.baseurl = 'file://%s' % released
+ elif repo.name == 'updates':
+ repo.baseurl = 'file://%s' % updates
#write new ks file
filename = "%s%s.ks" % (folder, spin.name)
@@ -225,6 +226,8 @@ def livecd_command(spin):
folder = "%s%s_%s" % (settings.CACHE, spin.id, spin.name)
cache_path = os.path.join(settings.CACHE, 'cache/')
tmp_path = os.path.join(settings.CACHE, 'tmp/')
+ if not os.path.exists(tmp_path):
+ os.makedirs(tmp_path)
cmd = "cd %s;sudo livecd-creator -c %s --cache='%s' -t '%s' -f
%s" \
% (folder, ks_path, cache_path, tmp_path, fs_label)
return cmd
Show replies by date