Create the snapshot image names in the format Soas-23-Jan-2009.iso

- remove the version file part
- abort if file with the same timestamp exist

2 files changed, 13 insertions, 14 deletions

diff --git a/build b/build
index 4c9a841..52554fa 100755
--- a/build
+++ b/build
@@ -3,6 +3,7 @@
 import logging
 import os
 import sys
+from time import gmtime, strftime
 
 import imgcreate
 
@@ -15,14 +16,14 @@ def main():
     if not os.path.exists(images_dir):
         os.mkdir(images_dir)
 
-    try:
-        last = open(last_file).read()
-        version = int(last) + 1
-    except IOError:
-        version = 1
+    image_date = strftime("%d-%b-%Y", gmtime())
+    image_name = 'Soas-%s' % image_date	
+    if os.path.exists(os.path.join(images_dir, image_name + '.iso')):
+	print 'Image %s exist already' % image_name
+	sys.exit(2)
 
     ks = imgcreate.read_kickstart(os.path.join(base_dir, 'soas.ks'))
-    creator = imgcreate.LiveImageCreator(ks, 'soas-%d' % version, 'Sugar')
+    creator = imgcreate.LiveImageCreator(ks, image_name, 'Sugar')
 
     try:
         creator.mount(cachedir=cache_dir)
@@ -36,8 +37,6 @@ def main():
     finally:
         creator.cleanup()
 
-    open(last_file, 'w').write(str(version))
-
     return 0
 
 if __name__ == "__main__":
diff --git a/soas.ks b/soas.ks
index 335e91a..f433296 100644
--- a/soas.ks
+++ b/soas.ks
@@ -5,7 +5,7 @@
 
 %include fedora-live-base.ks
 
-repo --name=sugar --baseurl=http://shell.sugarlabs.org/~erikos/fedora-10-i386
+repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/1/
 repo --name=extra-activities --baseurl=http://shell.sugarlabs.org/~alsroot/SoaS/
 
 %packages
@@ -32,11 +32,11 @@ sugar-jigsaw-puzzle
 sugar-joke-machine
 sugar-poll-builder
 sugar-slider-puzzle
-sugar-tamtam-common
-sugar-tamtam-edit
-sugar-tamtam-jam
-sugar-tamtam-mini
-sugar-tamtam-synthlab
+#sugar-tamtam-common
+#sugar-tamtam-edit
+#sugar-tamtam-jam
+#sugar-tamtam-mini
+#sugar-tamtam-synthlab
 
 # display manager
 slim