| 1 |
commit: 28dc9209b9e9787a1c9dc968f68ad89051a699f6 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 31 13:40:04 2016 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 13:40:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=28dc9209 |
| 7 |
|
| 8 |
small fixes |
| 9 |
|
| 10 |
pym/tbc/package.py | 2 +- |
| 11 |
pym/tbc/sqlquerys.py | 4 ++-- |
| 12 |
pym/tbc/sync.py | 20 ++++++++++---------- |
| 13 |
3 files changed, 13 insertions(+), 13 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/tbc/package.py b/pym/tbc/package.py |
| 16 |
index cf711ff..510a5d2 100644 |
| 17 |
--- a/pym/tbc/package.py |
| 18 |
+++ b/pym/tbc/package.py |
| 19 |
@@ -376,7 +376,7 @@ class tbc_package(object): |
| 20 |
else: |
| 21 |
# Remove cpv from packageDict and add ebuild to new ebuils list |
| 22 |
del packageDict[cpv] |
| 23 |
- ebuild_id , status = get_ebuild_id_db(self._session, ebuild_version_checksum_tree, package_id) |
| 24 |
+ ebuild_id , status = get_ebuild_id_db(self._session, ebuild_version_checksum_tree, package_id, ebuild_version_tree) |
| 25 |
new_ebuild_id_list.append(ebuild_id) |
| 26 |
self.add_package(packageDict, package_metadataDict, package_id, new_ebuild_id_list, old_ebuild_id_list) |
| 27 |
|
| 28 |
|
| 29 |
diff --git a/pym/tbc/sqlquerys.py b/pym/tbc/sqlquerys.py |
| 30 |
index 2fdb7f1..9ada5dd 100644 |
| 31 |
--- a/pym/tbc/sqlquerys.py |
| 32 |
+++ b/pym/tbc/sqlquerys.py |
| 33 |
@@ -504,10 +504,10 @@ def update_package_metadata(session, package_metadataDict): |
| 34 |
try: |
| 35 |
PackagesMetadataInfo = session.query(PackagesMetadata).filter_by(PackageId = k).one() |
| 36 |
except NoResultFound as e: |
| 37 |
- session.add(PackagesMetadata(PackageId = k, Changlog = v['changelog_text'], Descriptions = v['metadata_xml_descriptions'])) |
| 38 |
+ session.add(PackagesMetadata(PackageId = k, Gitlog = v['git_changlog'], Descriptions = v['metadata_xml_descriptions'])) |
| 39 |
session.commit() |
| 40 |
else: |
| 41 |
- PackagesMetadataInfo.Changlog = v['changelog_text'] |
| 42 |
+ PackagesMetadataInfo.Gitlog = v['git_changlog'] |
| 43 |
PackagesMetadataInfo.Descriptions = v['metadata_xml_descriptions'] |
| 44 |
session.commit() |
| 45 |
if v['metadata_xml_email']: |
| 46 |
|
| 47 |
diff --git a/pym/tbc/sync.py b/pym/tbc/sync.py |
| 48 |
index 2d22e74..52d84ab 100644 |
| 49 |
--- a/pym/tbc/sync.py |
| 50 |
+++ b/pym/tbc/sync.py |
| 51 |
@@ -73,7 +73,7 @@ def git_sync_main(session): |
| 52 |
# check git diffs witch get updated and pass that to a dict |
| 53 |
# fetch and merge the repo |
| 54 |
repo_cp_dict = {} |
| 55 |
- search_list = [ '^metadata', '^eclass', '^licenses', '^profiles', '^scripts',] |
| 56 |
+ search_list = [ '^metadata', '^eclass', '^licenses', '^profiles', '^scripts', '^skel.ebuild',] |
| 57 |
for repo_dir in git_repos_list(myportdb): |
| 58 |
reponame = myportdb.getRepositoryName(repo_dir) |
| 59 |
repo = git.Repo(repo_dir) |
| 60 |
@@ -87,15 +87,15 @@ def git_sync_main(session): |
| 61 |
repo_diff = repo.git.diff('origin', '--name-only') |
| 62 |
write_log(session, 'Git dir diff:\n%s' % (repo_diff,), "debug", config_id, 'sync.git_sync_main') |
| 63 |
for diff_line in repo_diff.splitlines(): |
| 64 |
- find_search = True |
| 65 |
- for search_line in search_list: |
| 66 |
- if re.search(search_line, diff_line): |
| 67 |
- find_search = False |
| 68 |
- if find_search: |
| 69 |
- splited_diff_line = re.split('/', diff_line) |
| 70 |
- cp = splited_diff_line[0] + '/' + splited_diff_line[1] |
| 71 |
- if not cp in cp_list: |
| 72 |
- cp_list.append(cp) |
| 73 |
+ find_search = True |
| 74 |
+ for search_line in search_list: |
| 75 |
+ if re.search(search_line, diff_line): |
| 76 |
+ find_search = False |
| 77 |
+ if find_search: |
| 78 |
+ splited_diff_line = re.split('/', diff_line) |
| 79 |
+ cp = splited_diff_line[0] + '/' + splited_diff_line[1] |
| 80 |
+ if not cp in cp_list: |
| 81 |
+ cp_list.append(cp) |
| 82 |
attr['cp_list'] = cp_list |
| 83 |
write_log(session, 'Git CP Diff: %s' % (cp_list,), "debug", config_id, 'sync.git_sync_main') |
| 84 |
repo_cp_dict[reponame] = attr |
Archives