From 2c680a9c31a4f1bbaf6ca309cf501c5608a62871 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 1 Aug 2011 21:44:59 +0200 Subject: [PATCH] [matter] make entropy repo commit optional via --commit --- services/matter | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/services/matter b/services/matter index 4775c673b..6a94e9f64 100755 --- a/services/matter +++ b/services/matter @@ -916,6 +916,10 @@ Environment variables passed to --pkgpre/--pkgpost executables: help="when trying to acquire Entropy Server locks, block until success", action="store_true") + parser.add_argument("--commit", + help="commit built packages to repository", + action="store_true") + parser.add_argument("--community", help="enforce Community Repository mode on Entropy Server", action="store_true") @@ -928,10 +932,6 @@ Environment variables passed to --pkgpre/--pkgpost executables: help="do not run if staged packages are present in Entropy repository", action="store_true") - parser.add_argument("--push", - help="push entropy package updates to online repository", - action="store_true") - parser.add_argument("--pre", metavar="", type=file, help="executable to be called once for setup purposes", default=None) @@ -940,6 +940,10 @@ Environment variables passed to --pkgpre/--pkgpost executables: help="executable to be called once for teardown purposes", default=None) + parser.add_argument("--push", + help="push entropy package updates to online repository (only if --commit)", + action="store_true") + parser.add_argument("--sync", help="sync Portage tree, and attached overlays, before starting", action="store_true") @@ -1072,7 +1076,7 @@ Environment variables passed to --pkgpre/--pkgpost executables: # portage calls setcwd() os.chdir(cwd) - if local_completed: + if local_completed and nsargs.commit: rc = PackageBuilder.commit(entropy_server, spec["repository"], local_completed) if exit_st == 0 and rc != 0: @@ -1080,7 +1084,7 @@ Environment variables passed to --pkgpre/--pkgpost executables: if not keep_going: break - if tainted_repositories and nsargs.push \ + if tainted_repositories and nsargs.push and nsargs.commit \ and not preserved_libs_error: for repository in tainted_repositories: rc = PackageBuilder.push(entropy_server,