debian_build: better logging and sort static lists

diff --git a/debian_build.py b/debian_build.py
index a9a5d53b41c1f17170fe4045378258b2c0c377be..ec0f462d9204fb7f64e7beacab34db4c7bb59327 100755 (executable)
--- a/debian_build.py
+++ b/debian_build.py
@@ -41,9 +41,10 @@ ENV.setdefault('BUILD_TRIGGERS', '')
 BUILD_START = datetime.datetime.now()
 
 AUTO_CHANGELOG_REPONAMES = (
+    'infrastructure-docs',
     'ri-docs',
+    'sl',
     'so-docs',
-    'infrastructure-docs',
     'storage-docs',
 )
 STABLE_DISTRIBUTIONS = (
@@ -114,7 +115,7 @@ if __name__ == '__main__':
 
     # .. repository related
     gitrepo = git.Repo('.')
-    if not has_attr(gitrepo,'remotes'):
+    if not hasattr(gitrepo,'remotes'):
         #    this should be part of 'git' lib, but it isn't right now
         gitrepo.remotes = {}
         for remote in gitrepo.git.remote('-v').split('\n'):
@@ -186,6 +187,7 @@ if __name__ == '__main__':
             do_liveboot_request = True
             # .. fail if we already found the tag we would create upon a successfull build,
             #    except, the existing tag uses the same commit as we were triggered with
+            # FIXME: tagging only works for squeeze this way, change it to make it multipledist compatible
             remote_tag = [tag for tag in gitrepo.tags if tag.name == new_tag]
             if len(remote_tag) > 0:
                 if remote_tag[0].commit.id == curr_commit_id:
@@ -373,10 +375,11 @@ if __name__ == '__main__':
         subprocess.check_call([BIN_GIT_DCH, '-R', '-a', '--spawn-editor=none'])
         gitrepo.git.commit('-a', '-s', '-m', 'Released by jenkins')
         gitrepo.git.push('origin', 'master')
-        logger.info('Changelog incremented by jenkins using debian_build.py!')
+        logger.info('Changelog autoincremented and pushed back by Jenkins!')
 
     # .. or set approriate versions for our development candidates
     else:
+        logger.info('Project is not respected by autoincrement.')
         cmd = [
             BIN_DCH,
             '--newversion',