From 1d567905c8b182dc11c951db6ce192556dafac47 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Sun, 8 Jul 2007 16:04:21 +0200
Subject: [PATCH] Make maint helper add snapshot to NEWS and update NEWS.sugar

---
 maint-helper.py                 | 46 +++++++++++++++++++++++++++++++--
 sugar/activity/bundlebuilder.py |  2 +-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/maint-helper.py b/maint-helper.py
index 45be31f5..5d629ff1 100755
--- a/maint-helper.py
+++ b/maint-helper.py
@@ -55,9 +55,51 @@ def cmd_build_snapshot():
 
     tarball = '%s-%s-git%s.tar.bz2' % (name, version, alphatag)
 
-    os.spawnlp(os.P_WAIT, 'make', 'make', 'distcheck')
+    print 'Build %s...' % tarball
 
-    os.rename('%s-%s.tar.bz2' % (name, version), tarball)
+    #os.spawnlp(os.P_WAIT, 'make', 'make', 'distcheck')
+
+    #os.rename('%s-%s.tar.bz2' % (name, version), tarball)
+
+    print 'Update NEWS.sugar...'
+
+    if os.environ.has_key('SUGAR_NEWS'):
+        sugar_news_path = os.environ['SUGAR_NEWS']
+        if os.path.isfile(sugar_news_path):
+            f = open(sugar_news_path, 'r')
+            sugar_news = f.read()
+            f.close()
+        else:
+            sugar_news = ''
+
+        [ name, version ] = get_name_and_version()
+        sugar_news += '%s - %s - %s\n\n' % (name, version, alphatag)
+
+        f = open('NEWS', 'r')
+        for line in f.readline():
+            if len(line) > 0:
+                sugar_news += line
+            else:
+                break
+        f.close()
+
+        f = open(sugar_news_path, 'w')
+        f.write(sugar_news)
+        f.close()
+
+    print 'Update NEWS...'
+
+    f = open('NEWS', 'r')
+    news = f.read()
+    f.close()
+
+    news = 'Snapshot %s\n\n' % alphatag + news
+
+    f = open('NEWS', 'w')
+    f.write(news)
+    f.close()
+
+    print 'Done.'
 
 def check_licenses(path, license, missing):
     matchers = { 'LGPL' : 'GNU Lesser General Public',
diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py
index a412d170..a82d744b 100644
--- a/sugar/activity/bundlebuilder.py
+++ b/sugar/activity/bundlebuilder.py
@@ -257,7 +257,7 @@ def cmd_release(bundle_name, manifest):
     news_path = os.path.join(_get_source_path(), 'NEWS')
 
     if os.environ.has_key('SUGAR_NEWS'):
-        print 'Update NEWS.sugar'
+        print 'Update NEWS.sugar...'
 
         sugar_news_path = os.environ['SUGAR_NEWS']
         if os.path.isfile(sugar_news_path):