# HG changeset patch # User Mads Kiilerich # Date 2015-11-07 13:24:44 # Node ID ebc4cc82cce2685755e3404745d24819029fc8ab # Parent 21f80c6cdf0c993b25e8c46cd6b5346da79ca739 # Parent 737c3704b44a8d210fddbc3dcab8bd442fa582ab Merge stable diff --git a/kallithea/lib/auth_modules/auth_pam.py b/kallithea/lib/auth_modules/auth_pam.py --- a/kallithea/lib/auth_modules/auth_pam.py +++ b/kallithea/lib/auth_modules/auth_pam.py @@ -123,9 +123,9 @@ class KallitheaAuthPlugin(auth_modules.K } try: - user_data = pwd.getpwnam(username) + user_pw_data = pwd.getpwnam(username) regex = settings["gecos"] - match = re.search(regex, user_data.pw_gecos) + match = re.search(regex, user_pw_data.pw_gecos) if match: user_data["firstname"] = match.group('first_name') user_data["lastname"] = match.group('last_name') diff --git a/kallithea/lib/paster_commands/update_repoinfo.py b/kallithea/lib/paster_commands/update_repoinfo.py --- a/kallithea/lib/paster_commands/update_repoinfo.py +++ b/kallithea/lib/paster_commands/update_repoinfo.py @@ -63,7 +63,7 @@ class Command(BasePasterCommand): self.options.repo_update_list.split(',')) \ if self.options.repo_update_list else None - if repo_update_list: + if repo_update_list is not None: repo_list = list(Repository.query()\ .filter(Repository.repo_name.in_(repo_update_list))) else: diff --git a/kallithea/lib/vcs/backends/git/changeset.py b/kallithea/lib/vcs/backends/git/changeset.py --- a/kallithea/lib/vcs/backends/git/changeset.py +++ b/kallithea/lib/vcs/backends/git/changeset.py @@ -287,7 +287,7 @@ class GitChangeset(BaseChangeset): cs_id = safe_str(self.id) f_path = safe_str(path) - if limit: + if limit is not None: cmd = ['log', '-n', str(safe_int(limit, 0)), '--pretty=format:%H', '-s', cs_id, '--', f_path] diff --git a/kallithea/lib/vcs/backends/hg/changeset.py b/kallithea/lib/vcs/backends/hg/changeset.py --- a/kallithea/lib/vcs/backends/hg/changeset.py +++ b/kallithea/lib/vcs/backends/hg/changeset.py @@ -256,7 +256,7 @@ class MercurialChangeset(BaseChangeset): for cs in reversed([x for x in fctx.filelog()]): cnt += 1 hist.append(hex(fctx.filectx(cs).node())) - if limit and cnt == limit: + if limit is not None and cnt == limit: break return [self.repository.get_changeset(node) for node in hist] diff --git a/kallithea/model/repo.py b/kallithea/model/repo.py --- a/kallithea/model/repo.py +++ b/kallithea/model/repo.py @@ -175,7 +175,7 @@ class RepoModel(BaseModel): @classmethod def update_repoinfo(cls, repositories=None): - if not repositories: + if repositories is None: repositories = Repository.getAll() for repo in repositories: repo.update_changeset_cache() diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -977,7 +977,7 @@ var getSelectionLink = function(e) { $('body').prepend($hl_div); } - $hl_div.append($('').html(_TM['Selection link']).prop('href', location.href.substring(0, location.href.indexOf('#')) + '#L' + ranges[0] + '-'+ranges[1])); + $hl_div.append($('').html(_TM['Selection Link']).prop('href', location.href.substring(0, location.href.indexOf('#')) + '#L' + ranges[0] + '-'+ranges[1])); var xy = $(till).offset(); $hl_div.css('top', (xy.top + yoffset) + 'px').css('left', xy.left + 'px'); $hl_div.show();