Updated Polish translation

[empathy.git] / release.py

diff --git a/release.py b/release.py
index 13fa386b2f89c075aa4bbb70c826993d6667f360..d5a4c92d2c316bf085ab96b7c4ac19320a33fea8 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_patern = 'EMPATHY_2_29*'
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
@@ -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)
@@ -162,9 +161,9 @@ class Project:
                return translations
 
        def get_bug_author(self, bug_number):
-               cmd = 'git log %s.. | grep -B 20 "#%s"' \
+               cmd = 'git log %s.. | grep -B 20 -E "(bug %s|#%s)"' \
                      ' | tac | grep ^Author: | head -1' \
-                     % (self.last_tag, bug_number)
+                     % (self.last_tag, bug_number, bug_number)
                line = self.exec_cmd (cmd)
                p1 = line.find(" ")
                p2 = line.find("<")
@@ -246,7 +245,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)