Merge branch 'sasl'

[empathy.git] / release.py

diff --git a/release.py b/release.py
index c7b773363d98c3fac6fc31b2623aee7f8911c420..00ca67ead5aab437ccd62201afdc581d89475a00 100755 (executable)
--- a/release.py
+++ b/release.py
@@ -9,8 +9,7 @@ import time
 from string import Template
 from optparse import OptionParser
 
-last_tag_patern = 'EMPATHY_2_27*'
-username = 'xclaesse'
+last_tag_pattern = 'EMPATHY_2_91*'
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
@@ -68,7 +67,7 @@ class Project:
                        version_dir = self.package_version[:second]
                self.package_dl_url = 'http://download.gnome.org/sources/%s/%s/' % (self.package_name.lower(), 
                                                                                    version_dir)
-               tags_str = self.exec_cmd('git tag -l %s' % (last_tag_patern))
+               tags_str = self.exec_cmd('git tag -l %s' % (last_tag_pattern))
                tags = tags_str.splitlines()
                self.last_tag = tags[len(tags)-1]
 
@@ -110,10 +109,10 @@ class Project:
                end = s.find(s2, i + 1)
                description = s[start:end]
 
-               s1 = "GNOME SVN"
+               s1 = "homepage"
                i = s.find(s1)
                s1 = "href"
-               i = s.find(s1, i)        
+               i = s.rfind(s1, 0, i)
                start = i + 6
                s2 = '">'
                end = s.find(s2, start)
@@ -220,7 +219,10 @@ class Project:
                        " - Updated %s Documentation translation (%s)\n")
                bugs = self.get_bugs()
 
-               news = 'NEW in '+ self.package_version + '\n==============\n'
+               news = 'NEW in '+ self.package_version
+               line = '=' * len(news)
+               today = datetime.date.today()
+               news += ' (%s)\n%s\n' % (today.strftime('%d/%m/%Y'),line)
                if bugs != '':
                        news += 'Bugs fixed:\n' + bugs + '\n'
                if translations != '':
@@ -246,7 +248,16 @@ class Project:
                          self.package_version.replace('.', '_')
                self.exec_cmd('git tag -m "Tagged for release %s." %s' % ( self.package_version, new_tag))
 
+       def _get_username(self):
+               username = os.environ.get('GNOME_ACCOUNT_NAME')
+               if username is not None:
+                       return username
+                       
+               return os.getlogin()
+               
+
        def upload_tarball(self):
+               username = self._get_username()
                tarball = '%s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
 
                cmd = 'scp %s %s@%s:' % (tarball, username, upload_server)