ChangeLog dorrie/comps
by Shreyank Gupta
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
13 years, 10 months
- 1
- 0
2 commits - dorrie/comps dorrie/settings.py .gitignore INSTALL
by Shreyank Gupta
.gitignore | 5 +++++
INSTALL | 9 +++------
dorrie/comps/media/cache | 1 -
dorrie/settings.py | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 340539e082697e3f38f0e692ff522241f8174dac
Author: Shreyank Gupta <sgupta(a)redhat.com>
Date: Fri Jun 25 16:23:58 2010 +0530
added /tmp/ as default CACHE
diff --git a/dorrie/settings.py b/dorrie/settings.py
index 2486c91..846b03a 100644
--- a/dorrie/settings.py
+++ b/dorrie/settings.py
@@ -109,7 +109,7 @@ COMPS_URL = \
KS_DIR = '/usr/share/spin-kickstarts/'
# cache to store the built KS files and spins (Read 'lots of GBs')
-CACHE = ''
+CACHE = '/tmp/'
# Local fedora repository to the folder that contains Packages
REPO = ''
commit b11f7570cc308d0c844e58c060d6dc7513233f84
Author: Shreyank Gupta <sgupta(a)redhat.com>
Date: Fri Jun 25 15:57:23 2010 +0530
Added .gitignore, updated INSTALL, removed cache symlink
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..27d79bf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.pyc
+*.sqlite3
+*.swp
+comps*.xml
+dorrie/comps/media/cache
diff --git a/INSTALL b/INSTALL
index fc50871..aafd6fd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -13,6 +13,7 @@ Required packages:
- sqlite
- python-sqlite2
- yum
+- system-config-language
If you're choosing MySQL, replace the sqlite dependencies with the MySQL ones:
@@ -41,13 +42,9 @@ How to Install:
Leave the host and port empty id the database is at the same mechine as the
application.
-2. Set ``APP_ROOT`` to the path where the application is installed::
+2. Set ``CACHE`` to a directory writable by the user running the application.
- APP_ROOT = '/path/to/dorrie/'
-
-3. Set ``CACHE`` to a directory writable by the user running the application.
-
-4. Create the required table structure in the database::
+3. Create the required table structure in the database::
$ python manage.py syncdb
diff --git a/dorrie/comps/media/cache b/dorrie/comps/media/cache
deleted file mode 120000
index b66e9e6..0000000
--- a/dorrie/comps/media/cache
+++ /dev/null
@@ -1 +0,0 @@
-/dump/dorrie/
\ No newline at end of file
13 years, 10 months
- 1
- 0
- ← Newer
- 1
- Older →