commit: 28dc9209b9e9787a1c9dc968f68ad89051a699f6
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 13:40:04 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 13:40:04 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=28dc9209
small fixes
pym/tbc/package.py | 2 +-
pym/tbc/sqlquerys.py | 4 ++--
pym/tbc/sync.py | 20 ++++++++++----------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pym/tbc/package.py b/pym/tbc/package.py
index cf711ff..510a5d2 100644
--- a/pym/tbc/package.py
+++ b/pym/tbc/package.py
@@ -376,7 +376,7 @@ class tbc_package(object):
else:
# Remove cpv from packageDict and add ebuild to
new ebuils list
del packageDict[cpv]
- ebuild_id , status =
get_ebuild_id_db(self._session, ebuild_version_checksum_tree, package_id)
+ ebuild_id , status =
get_ebuild_id_db(self._session, ebuild_version_checksum_tree, package_id,
ebuild_version_tree)
new_ebuild_id_list.append(ebuild_id)
self.add_package(packageDict, package_metadataDict, package_id,
new_ebuild_id_list, old_ebuild_id_list)
diff --git a/pym/tbc/sqlquerys.py b/pym/tbc/sqlquerys.py
index 2fdb7f1..9ada5dd 100644
--- a/pym/tbc/sqlquerys.py
+++ b/pym/tbc/sqlquerys.py
@@ -504,10 +504,10 @@ def update_package_metadata(session,
package_metadataDict):
try:
PackagesMetadataInfo =
session.query(PackagesMetadata).filter_by(PackageId = k).one()
except NoResultFound as e:
- session.add(PackagesMetadata(PackageId = k, Changlog =
v['changelog_text'], Descriptions = v['metadata_xml_descriptions']))
+ session.add(PackagesMetadata(PackageId = k, Gitlog =
v['git_changlog'], Descriptions = v['metadata_xml_descriptions']))
session.commit()
else:
- PackagesMetadataInfo.Changlog = v['changelog_text']
+ PackagesMetadataInfo.Gitlog = v['git_changlog']
PackagesMetadataInfo.Descriptions =
v['metadata_xml_descriptions']
session.commit()
if v['metadata_xml_email']:
diff --git a/pym/tbc/sync.py b/pym/tbc/sync.py
index 2d22e74..52d84ab 100644
--- a/pym/tbc/sync.py
+++ b/pym/tbc/sync.py
@@ -73,7 +73,7 @@ def git_sync_main(session):
# check git diffs witch get updated and pass that to a dict
# fetch and merge the repo
repo_cp_dict = {}
- search_list = [ '^metadata', '^eclass', '^licenses', '^profiles',
'^scripts',]
+ search_list = [ '^metadata', '^eclass', '^licenses', '^profiles',
'^scripts', '^skel.ebuild',]
for repo_dir in git_repos_list(myportdb):
reponame = myportdb.getRepositoryName(repo_dir)
repo = git.Repo(repo_dir)
@@ -87,15 +87,15 @@ def git_sync_main(session):
repo_diff = repo.git.diff('origin', '--name-only')
write_log(session, 'Git dir diff:\n%s' % (repo_diff,),
"debug", config_id, 'sync.git_sync_main')
for diff_line in repo_diff.splitlines():
- find_search = True
- for search_line in search_list:
- if re.search(search_line, diff_line):
- find_search = False
- if find_search:
- splited_diff_line = re.split('/',
diff_line)
- cp = splited_diff_line[0] + '/' +
splited_diff_line[1]
- if not cp in cp_list:
- cp_list.append(cp)
+ find_search = True
+ for search_line in search_list:
+ if re.search(search_line, diff_line):
+ find_search = False
+ if find_search:
+ splited_diff_line = re.split('/',
diff_line)
+ cp = splited_diff_line[0] + '/' +
splited_diff_line[1]
+ if not cp in cp_list:
+ cp_list.append(cp)
attr['cp_list'] = cp_list
write_log(session, 'Git CP Diff: %s' % (cp_list,),
"debug", config_id, 'sync.git_sync_main')
repo_cp_dict[reponame] = attr
