* [gentoo-commits] proj/tinderbox-cluster:master commit in: patches/, ebuild/
@ 2016-11-15 21:58 Magnus Granberg
0 siblings, 0 replies; 2+ messages in thread
From: Magnus Granberg @ 2016-11-15 21:58 UTC (permalink / raw
To: gentoo-commits
commit: b7cd026aa1bd1875b659093ad84b8015fe45e0cb
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 21:57:55 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 21:57:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=b7cd026a
Update ebuild and patch to support splited portage and repoman
ebuild/tbc-9999.ebuild | 5 +++--
patches/portage.patch | 38 ++++++++++++++++++++------------------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/ebuild/tbc-9999.ebuild b/ebuild/tbc-9999.ebuild
index 24dd1d6..f21147e 100644
--- a/ebuild/tbc-9999.ebuild
+++ b/ebuild/tbc-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4})
+PYTHON_COMPAT=( python{2_7,3_4,3_5})
inherit distutils-r1 git-2
@@ -15,7 +15,8 @@ KEYWORDS="~amd64"
SLOT="0"
IUSE="+mysql"
-RDEPEND=">=sys-apps/portage-2.2.27[${PYTHON_USEDEP}]
+RDEPEND=">=sys-apps/portage-2.3.2[${PYTHON_USEDEP}]
+ >=sys-apps/repoman-2.3.0-r2[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
dev-python/git-python[${PYTHON_USEDEP}]
mysql? ( dev-python/mysql-connector-python[${PYTHON_USEDEP}] )"
diff --git a/patches/portage.patch b/patches/portage.patch
index 6f2d17f..d925ea8 100644
--- a/patches/portage.patch
+++ b/patches/portage.patch
@@ -35,16 +35,17 @@
if sys.hexversion >= 0x3000000:
long = int
_unicode = str
-@@ -90,7 +92,7 @@ else:
- _unicode = unicode
+@@ -98,7 +98,8 @@ else:
- def action_build(settings, trees, mtimedb,
-- myopts, myaction, myfiles, spinner):
-+ myopts, myaction, myfiles, spinner, build_dict, session):
+ def action_build(emerge_config, trees=DeprecationWarning,
+ mtimedb=DeprecationWarning, myopts=DeprecationWarning,
+- myaction=DeprecationWarning, myfiles=DeprecationWarning, spinner=None):
++ myaction=DeprecationWarning, myfiles=DeprecationWarning,
++ spinner=None, build_dict, session):
- if '--usepkgonly' not in myopts:
- old_tree_timestamp_warn(settings['PORTDIR'], settings)
-@@ -319,20 +319,14 @@ def action_build(settings, trees, mtimed
+ if not isinstance(emerge_config, _emerge_config):
+ warnings.warn("_emerge.actions.action_build() now expects "
+@@ -333,13 +334,8 @@ def action_build(emerge_config, trees=DeprecationWarning,
print(darkgreen("emerge: It seems we have nothing to resume..."))
return os.EX_OK
@@ -56,10 +57,11 @@
- display_missing_pkg_set(root_config, e.value)
- return 1
+ success, settings, trees, mtimedb, mydepgraph = build_mydepgraph(settings,
-+ trees, mtimedb, myopts, myparams, myaction, myfiles, spinner, build_dict, session)
++ trees, mtimedb, myopts, myparams, myaction, myfiles, spinner, build_dict, session)
- if "--autounmask-only" in myopts:
- mydepgraph.display_problems()
+ if success and mydepgraph.need_config_reload():
+ load_emerge_config(emerge_config=emerge_config)
+@@ -351,7 +347,6 @@ def action_build(emerge_config, trees=DeprecationWarning,
return 0
if not success:
@@ -177,12 +179,12 @@
# skip global updates prior to sync, since it's called after sync
if emerge_config.action not in ('help', 'info', 'sync', 'version') and \
-@@ -4059,7 +4059,7 @@ def run_action(emerge_config):
- retval = action_build(emerge_config.target_config.settings,
- emerge_config.trees, emerge_config.target_config.mtimedb,
- emerge_config.opts, emerge_config.action,
-- emerge_config.args, spinner)
-+ emerge_config.args, spinner, build_dict, session)
+@@ -3258,7 +3253,7 @@ def run_action(emerge_config):
+ except OSError:
+ writemsg("Please install eselect to use this feature.\n",
+ noiselevel=-1)
+- retval = action_build(emerge_config, spinner=spinner)
++ retval = action_build(emerge_config, spinner=spinner, build_dict, session)
post_emerge(emerge_config.action, emerge_config.opts,
emerge_config.args, emerge_config.target_config.root,
emerge_config.trees, emerge_config.target_config.mtimedb, retval)
@@ -321,7 +323,7 @@
- # output the results
- actions = Actions(repo_settings, options, scanner, vcs_settings)
-- if actions.inform(can_force, result):
+- if actions.inform(can_force.get(), result):
- # perform any other actions
- actions.perform(qa_output)
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/tinderbox-cluster:master commit in: patches/, ebuild/
@ 2016-11-20 14:48 Magnus Granberg
0 siblings, 0 replies; 2+ messages in thread
From: Magnus Granberg @ 2016-11-20 14:48 UTC (permalink / raw
To: gentoo-commits
commit: b7c426b4b50bf704f9af9a26597e2a266996c59e
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 14:48:06 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 14:48:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=b7c426b4
split portage and repoman patches and typos
ebuild/tbc-9999.ebuild | 3 ++-
patches/portage.patch | 59 +++++++++-----------------------------------------
patches/repoman.patch | 42 +++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/ebuild/tbc-9999.ebuild b/ebuild/tbc-9999.ebuild
index f21147e..e705155 100644
--- a/ebuild/tbc-9999.ebuild
+++ b/ebuild/tbc-9999.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
IUSE="+mysql"
RDEPEND=">=sys-apps/portage-2.3.2[${PYTHON_USEDEP}]
- >=sys-apps/repoman-2.3.0-r2[${PYTHON_USEDEP}]
+ >=app-portage/repoman-2.3.0-r2[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
dev-python/git-python[${PYTHON_USEDEP}]
mysql? ( dev-python/mysql-connector-python[${PYTHON_USEDEP}] )"
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/tinderbox-cluster.git"
PATCHES=(
"${S}"/patches/portage.patch
+ "${S}"/patches/repoman.patch
)
python_prepare_all() {
diff --git a/patches/portage.patch b/patches/portage.patch
index d925ea8..45fa880 100644
--- a/patches/portage.patch
+++ b/patches/portage.patch
@@ -1,4 +1,4 @@
-2015-10-04 Magnus Granberg <zorry@gentoo.org>
+2016-11-20 Magnus Granberg <zorry@gentoo.org>
* tbc/pym/actions.py
Use the patched Scheduler and add build_dict so it can be ust.
@@ -7,13 +7,11 @@
And pass unresolvable in action_depclean so we can use it later.
* tbc/pym/main.py
Use or own patched actions.
- We pass build_dict to some functions.
+ We pass build_dict and session to some functions.
* tbc/pym/Scheduler.py
We copy Scheduler.py from portage and patch it.
Fix so we can use add_buildlog_main()
We use add_buildlog_main() for loging.
- * tbc/pym/repoman.py
- We add config_root pkdir and remove action
--- a/pym/tbc/actions.py 2013-03-22 17:57:23.000000000 +0100
+++ b/pym/tbc/actions.py 2013-03-22 19:00:43.265582143 +0100
@@ -35,16 +33,15 @@
if sys.hexversion >= 0x3000000:
long = int
_unicode = str
-@@ -98,7 +98,8 @@ else:
+@@ -96,7 +96,7 @@ if sys.hexversion >= 0x3000000:
+ else:
+ _unicode = unicode
- def action_build(emerge_config, trees=DeprecationWarning,
+-def action_build(emerge_config, trees=DeprecationWarning,
++def action_build(emerge_config, build_dict, session, trees=DeprecationWarning,
mtimedb=DeprecationWarning, myopts=DeprecationWarning,
-- myaction=DeprecationWarning, myfiles=DeprecationWarning, spinner=None):
-+ myaction=DeprecationWarning, myfiles=DeprecationWarning,
-+ spinner=None, build_dict, session):
+ myaction=DeprecationWarning, myfiles=DeprecationWarning, spinner=None):
- if not isinstance(emerge_config, _emerge_config):
- warnings.warn("_emerge.actions.action_build() now expects "
@@ -333,13 +334,8 @@ def action_build(emerge_config, trees=DeprecationWarning,
print(darkgreen("emerge: It seems we have nothing to resume..."))
return os.EX_OK
@@ -179,12 +176,12 @@
# skip global updates prior to sync, since it's called after sync
if emerge_config.action not in ('help', 'info', 'sync', 'version') and \
-@@ -3258,7 +3253,7 @@ def run_action(emerge_config):
+@@ -3258,7 +3252,7 @@ def run_action(emerge_config):
except OSError:
writemsg("Please install eselect to use this feature.\n",
noiselevel=-1)
- retval = action_build(emerge_config, spinner=spinner)
-+ retval = action_build(emerge_config, spinner=spinner, build_dict, session)
++ retval = action_build(emerge_config, build_dict, session, spinner=spinner)
post_emerge(emerge_config.action, emerge_config.opts,
emerge_config.args, emerge_config.target_config.root,
emerge_config.trees, emerge_config.target_config.mtimedb, retval)
@@ -293,39 +290,3 @@
self._jobs -= 1
self._status_display.running = self._jobs
self._schedule()
---- a/pym/tbc/repoman.py 2015-09-22 02:20:41.000000000 +0200
-+++ b/pym/tbc/repoman.py 2015-10-04 20:21:57.586494104 +0200
-@@ -45,8 +45,9 @@ bad = create_color_func("BAD")
- os.umask(0o22)
-
-
--def repoman_main(argv):
-- config_root = os.environ.get("PORTAGE_CONFIGROOT")
-+def repoman_main(argv, config_root=None, pkgdir=None):
-+ if config_root is None:
-+ config_root = os.environ.get("PORTAGE_CONFIGROOT")
- repoman_settings = portage.config(config_root=config_root, local_config=False)
-
- if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
-@@ -71,6 +72,9 @@ def repoman_main(argv):
- # commit (like if Manifest generation fails).
- can_force = True
-
-+ if not pkgdir is None:
-+ os.chdir(pkgdir)
-+
- portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
- if portdir is None:
- sys.exit(1)
-@@ -159,10 +163,4 @@ def repoman_main(argv):
- qa_output = qa_output.getvalue()
- qa_output = qa_output.splitlines(True)
-
-- # output the results
-- actions = Actions(repo_settings, options, scanner, vcs_settings)
-- if actions.inform(can_force.get(), result):
-- # perform any other actions
-- actions.perform(qa_output)
--
-- sys.exit(0)
-+ return qatracker, qawarnings
diff --git a/patches/repoman.patch b/patches/repoman.patch
new file mode 100644
index 0000000..64ea894
--- /dev/null
+++ b/patches/repoman.patch
@@ -0,0 +1,42 @@
+2016-11-20 Magnus Granberg <zorry@gentoo.org>
+
+ * tbc/pym/repoman.py
+ We add config_root pkdir and remove action and return
+ vcs_settings.qatracker and qawarnings.
+
+--- a/pym/tbc/repoman.py 2015-09-22 02:20:41.000000000 +0200
++++ b/pym/tbc/repoman.py 2015-10-04 20:21:57.586494104 +0200
+@@ -45,8 +45,9 @@ bad = create_color_func("BAD")
+ os.umask(0o22)
+
+
+-def repoman_main(argv):
+- config_root = os.environ.get("PORTAGE_CONFIGROOT")
++def repoman_main(argv, config_root=None, pkgdir=None):
++ if config_root is None:
++ config_root = os.environ.get("PORTAGE_CONFIGROOT")
+ repoman_settings = portage.config(config_root=config_root, local_config=False)
+
+ if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
+@@ -71,6 +72,9 @@ def repoman_main(argv):
+ # commit (like if Manifest generation fails).
+ can_force = True
+
++ if not pkgdir is None:
++ os.chdir(pkgdir)
++
+ portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
+ if portdir is None:
+ sys.exit(1)
+@@ -159,10 +163,4 @@ def repoman_main(argv):
+ qa_output = qa_output.getvalue()
+ qa_output = qa_output.splitlines(True)
+
+- # output the results
+- actions = Actions(repo_settings, options, scanner, vcs_settings)
+- if actions.inform(can_force.get(), result):
+- # perform any other actions
+- actions.perform(qa_output)
+-
+- sys.exit(0)
++ return vcs_settings.qatracker, qawarnings
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-20 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-20 14:48 [gentoo-commits] proj/tinderbox-cluster:master commit in: patches/, ebuild/ Magnus Granberg
-- strict thread matches above, loose matches on Subject: below --
2016-11-15 21:58 Magnus Granberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox