| 1 |
commit: 81415947e93d59d2a5ea8163fc18a18f1cf4c389 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 1 23:12:14 2012 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 1 23:12:14 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=81415947 |
| 7 |
|
| 8 |
fix get_ebuild_cvs_revision in get_packageDict() |
| 9 |
|
| 10 |
--- |
| 11 |
gobs/pym/package.py | 8 ++++---- |
| 12 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gobs/pym/package.py b/gobs/pym/package.py |
| 15 |
index b8747bb..c960b07 100644 |
| 16 |
--- a/gobs/pym/package.py |
| 17 |
+++ b/gobs/pym/package.py |
| 18 |
@@ -3,7 +3,7 @@ import portage |
| 19 |
from gobs.flags import gobs_use_flags |
| 20 |
from gobs.repoman_gobs import gobs_repoman |
| 21 |
from gobs.manifest import gobs_manifest |
| 22 |
-from gobs.text import get_file_text, get_ebuild_text |
| 23 |
+from gobs.text import get_ebuild_cvs_revision |
| 24 |
from gobs.readconf import get_conf_settings |
| 25 |
from gobs.flags import gobs_use_flags |
| 26 |
reader=get_conf_settings() |
| 27 |
@@ -99,9 +99,9 @@ class gobs_package(object): |
| 28 |
add_gobs_logs(conn, log_msg, "info", config_profile) |
| 29 |
log_msg = "C %s:%s ... Fail." % (cpv, repo) |
| 30 |
add_gobs_logs(conn, log_msg, "info", config_profile) |
| 31 |
- ebuild_version_text_tree = '0' |
| 32 |
+ ebuild_version_cvs_revision_tree = '0' |
| 33 |
else: |
| 34 |
- ebuild_version_text_tree = get_ebuild_text(pkgdir + "/" + package + "-" + ebuild_version_tree + ".ebuild") |
| 35 |
+ ebuild_version_cvs_revision_tree = get_ebuild_cvs_revision(pkgdir + "/" + package + "-" + ebuild_version_tree + ".ebuild") |
| 36 |
|
| 37 |
# run repoman on the ebuild |
| 38 |
#init_repoman = gobs_repoman(self._mysettings, self._myportdb) |
| 39 |
@@ -128,7 +128,7 @@ class gobs_package(object): |
| 40 |
attDict['ebuild_version_checksum_tree']= ebuild_version_checksum_tree |
| 41 |
attDict['ebuild_version_metadata_tree'] = ebuild_version_metadata_tree |
| 42 |
#attDict['ebuild_version_text_tree'] = ebuild_version_text_tree[0] |
| 43 |
- attDict['ebuild_version_revision_tree'] = ebuild_version_text_tree[1] |
| 44 |
+ attDict['ebuild_version_revision_tree'] = ebuild_version_cvs_revision_tree |
| 45 |
attDict['ebuild_error'] = repoman_error |
| 46 |
CM.putConnection(conn) |
| 47 |
return attDict |
Archives