public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Arfrever Frehtes Taifersar Arahesis" <arfrever@apache.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: /, pym/portage/tests/dbapi/, pym/portage/tests/emerge/, bin/, pym/portage/tests/, ...
Date: Thu, 23 Jan 2014 21:36:56 +0000 (UTC)	[thread overview]
Message-ID: <1390512861.d9094187a8d9185107e10e9005fc0fbe2139ae44.arfrever@gentoo> (raw)

commit:     d9094187a8d9185107e10e9005fc0fbe2139ae44
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jan 23 21:34:21 2014 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
CommitDate: Thu Jan 23 21:34:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d9094187

Use -b instead of -bb.
(-bb can trigger errors, depending on Python version and environment.)

---
 bin/archive-conf                                 |  2 +-
 bin/binhost-snapshot                             |  2 +-
 bin/check-implicit-pointer-usage.py              |  2 +-
 bin/chpathtool.py                                |  2 +-
 bin/clean_locks                                  |  2 +-
 bin/dispatch-conf                                |  2 +-
 bin/dohtml.py                                    |  2 +-
 bin/ebuild                                       |  2 +-
 bin/ebuild-ipc.py                                |  2 +-
 bin/egencache                                    |  2 +-
 bin/emaint                                       |  2 +-
 bin/emerge                                       |  2 +-
 bin/emirrordist                                  |  2 +-
 bin/env-update                                   |  2 +-
 bin/filter-bash-environment.py                   |  2 +-
 bin/fixpackages                                  |  2 +-
 bin/glsa-check                                   |  2 +-
 bin/install.py                                   |  2 +-
 bin/lock-helper.py                               |  2 +-
 bin/portageq                                     |  2 +-
 bin/quickpkg                                     |  2 +-
 bin/regenworld                                   |  2 +-
 bin/repoman                                      |  2 +-
 bin/xattr-helper.py                              |  2 +-
 bin/xpak-helper.py                               |  2 +-
 pym/portage/tests/dbapi/test_portdb_cache.py     |  8 ++++----
 pym/portage/tests/emerge/test_emerge_slot_abi.py |  4 ++--
 pym/portage/tests/emerge/test_simple.py          | 20 ++++++++++----------
 pym/portage/tests/repoman/test_simple.py         |  2 +-
 pym/portage/tests/runTests                       |  2 +-
 pym/portage/tests/util/test_whirlpool.py         |  2 +-
 runtests.sh                                      |  2 +-
 tabcheck.py                                      |  2 +-
 33 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/bin/archive-conf b/bin/archive-conf
index f513ff8..f73ca42 100755
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/binhost-snapshot b/bin/binhost-snapshot
index 1a14020..c2204f0 100755
--- a/bin/binhost-snapshot
+++ b/bin/binhost-snapshot
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2010-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py
index 863c312..242436c 100755
--- a/bin/check-implicit-pointer-usage.py
+++ b/bin/check-implicit-pointer-usage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 
 # Ripped from HP and updated from Debian
 # Update by Gentoo to support unicode output

diff --git a/bin/chpathtool.py b/bin/chpathtool.py
index f5b2c67..6460662 100755
--- a/bin/chpathtool.py
+++ b/bin/chpathtool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2011-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/clean_locks b/bin/clean_locks
index 7d10409..3e969f2 100755
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbO
+#!/usr/bin/python -bO
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 6a818bf..4b0c0ac 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbO
+#!/usr/bin/python -bO
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/dohtml.py b/bin/dohtml.py
index 1b8c925..5359f5e 100755
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/ebuild b/bin/ebuild
index 2138aed..8f4b103 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbO
+#!/usr/bin/python -bO
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index bbb6e86..00337ee 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2010-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #

diff --git a/bin/egencache b/bin/egencache
index 2562d59..c14be93 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2009-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/emaint b/bin/emaint
index c5415c3..aeeb183 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbO
+#!/usr/bin/python -bO
 # Copyright 2005-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/emerge b/bin/emerge
index a415afa..bb93d83 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2006-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/emirrordist b/bin/emirrordist
index 2430aa7..0368eee 100755
--- a/bin/emirrordist
+++ b/bin/emirrordist
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2013-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/env-update b/bin/env-update
index 8e3b81c..7651ef9 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbO
+#!/usr/bin/python -bO
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py
index 838b422..a4cdc54 100755
--- a/bin/filter-bash-environment.py
+++ b/bin/filter-bash-environment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/fixpackages b/bin/fixpackages
index 3ec2832..cec0030 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/glsa-check b/bin/glsa-check
index 87eafca..972679a 100755
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2008-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/install.py b/bin/install.py
index 423ee42..3c5e0de 100755
--- a/bin/install.py
+++ b/bin/install.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2013-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/lock-helper.py b/bin/lock-helper.py
index 0c21835..aa2dd60 100755
--- a/bin/lock-helper.py
+++ b/bin/lock-helper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2010-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/portageq b/bin/portageq
index 59cc019..79818f6 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbO
+#!/usr/bin/python -bO
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/quickpkg b/bin/quickpkg
index a3e2f5b..90277ad 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/regenworld b/bin/regenworld
index 239ea9a..32e8e5c 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/repoman b/bin/repoman
index 1277f36..3504b6b 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbO
+#!/usr/bin/python -bO
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py
index 6525393..ea83a5e 100755
--- a/bin/xattr-helper.py
+++ b/bin/xattr-helper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2012-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/bin/xpak-helper.py b/bin/xpak-helper.py
index 9fdc8ce..c4391cd 100755
--- a/bin/xpak-helper.py
+++ b/bin/xpak-helper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bb
+#!/usr/bin/python -b
 # Copyright 2009-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

diff --git a/pym/portage/tests/dbapi/test_portdb_cache.py b/pym/portage/tests/dbapi/test_portdb_cache.py
index e04d8de..94af96e 100644
--- a/pym/portage/tests/dbapi/test_portdb_cache.py
+++ b/pym/portage/tests/dbapi/test_portdb_cache.py
@@ -37,11 +37,11 @@ class PortdbCacheTestCase(TestCase):
 		layout_conf_path = os.path.join(metadata_dir, "layout.conf")
 
 		portage_python = portage._python_interpreter
-		egencache_cmd = (portage_python, "-bb", "-Wd",
+		egencache_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "egencache"),
 			"--repo", "test_repo",
 			"--repositories-configuration", settings.repositories.config_string())
-		python_cmd = (portage_python, "-bb", "-Wd", "-c")
+		python_cmd = (portage_python, "-b", "-Wd", "-c")
 
 		test_commands = (
 			(lambda: not os.path.exists(pms_cache_dir),),
@@ -89,12 +89,12 @@ class PortdbCacheTestCase(TestCase):
 			(BASH_BINARY, "-c", "echo %s > %s" %
 				tuple(map(portage._shell_quote,
 				("cache-formats = pms md5-dict", layout_conf_path,)))),
-			(portage_python, "-bb", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent("""
+			(portage_python, "-b", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent("""
 				import os, sys, portage
 				if portage.portdb.porttree_root not in portage.portdb._pregen_auxdb:
 					sys.exit(1)
 			"""),),
-			(portage_python, "-bb", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent("""
+			(portage_python, "-b", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent("""
 				import os, sys, portage
 				from portage.cache.metadata import database as pms_database
 				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.porttree_root], pms_database):

diff --git a/pym/portage/tests/emerge/test_emerge_slot_abi.py b/pym/portage/tests/emerge/test_emerge_slot_abi.py
index e73ebc5..fd7ec0e 100644
--- a/pym/portage/tests/emerge/test_emerge_slot_abi.py
+++ b/pym/portage/tests/emerge/test_emerge_slot_abi.py
@@ -69,9 +69,9 @@ class SlotAbiEmergeTestCase(TestCase):
 		package_mask_path = os.path.join(user_config_dir, "package.mask")
 
 		portage_python = portage._python_interpreter
-		ebuild_cmd = (portage_python, "-bb", "-Wd",
+		ebuild_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "ebuild"))
-		emerge_cmd = (portage_python, "-bb", "-Wd",
+		emerge_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "emerge"))
 
 		test_ebuild = portdb.findname("dev-libs/dbus-glib-0.98")

diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
index 2016ae6..d3bb866 100644
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/pym/portage/tests/emerge/test_simple.py
@@ -174,29 +174,29 @@ pkg_preinst() {
 		cachedir_pregen = os.path.join(test_repo_location, "metadata", "md5-cache")
 
 		portage_python = portage._python_interpreter
-		dispatch_conf_cmd = (portage_python, "-bb", "-Wd",
+		dispatch_conf_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "dispatch-conf"))
-		ebuild_cmd = (portage_python, "-bb", "-Wd",
+		ebuild_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "ebuild"))
-		egencache_cmd = (portage_python, "-bb", "-Wd",
+		egencache_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "egencache"),
 			"--repo", "test_repo",
 			"--repositories-configuration", settings.repositories.config_string())
-		emerge_cmd = (portage_python, "-bb", "-Wd",
+		emerge_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "emerge"))
-		emaint_cmd = (portage_python, "-bb", "-Wd",
+		emaint_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "emaint"))
-		env_update_cmd = (portage_python, "-bb", "-Wd",
+		env_update_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "env-update"))
 		etc_update_cmd = (BASH_BINARY,
 			os.path.join(PORTAGE_BIN_PATH, "etc-update"))
-		fixpackages_cmd = (portage_python, "-bb", "-Wd",
+		fixpackages_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "fixpackages"))
-		portageq_cmd = (portage_python, "-bb", "-Wd",
+		portageq_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "portageq"))
-		quickpkg_cmd = (portage_python, "-bb", "-Wd",
+		quickpkg_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "quickpkg"))
-		regenworld_cmd = (portage_python, "-bb", "-Wd",
+		regenworld_cmd = (portage_python, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "regenworld"))
 
 		rm_binary = find_binary("rm")

diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py
index 9fc6d83..69eb36d 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -170,7 +170,7 @@ class SimpleRepomanTestCase(TestCase):
 		profiles_dir = os.path.join(test_repo_location, "profiles")
 		license_dir = os.path.join(test_repo_location, "licenses")
 
-		repoman_cmd = (portage._python_interpreter, "-bb", "-Wd",
+		repoman_cmd = (portage._python_interpreter, "-b", "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "repoman"))
 
 		git_binary = find_binary("git")

diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests
index 5869f37..9c45276 100755
--- a/pym/portage/tests/runTests
+++ b/pym/portage/tests/runTests
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbWd
+#!/usr/bin/python -bWd
 # runTests.py -- Portage Unit Test Functionality
 # Copyright 2006-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

diff --git a/pym/portage/tests/util/test_whirlpool.py b/pym/portage/tests/util/test_whirlpool.py
index ac78d97..fbe7cae 100644
--- a/pym/portage/tests/util/test_whirlpool.py
+++ b/pym/portage/tests/util/test_whirlpool.py
@@ -11,6 +11,6 @@ from portage.tests import TestCase
 class WhirlpoolTestCase(TestCase):
 	def testBundledWhirlpool(self):
 		# execute the tests bundled with the whirlpool module
-		retval = subprocess.call([portage._python_interpreter, "-bb", "-Wd",
+		retval = subprocess.call([portage._python_interpreter, "-b", "-Wd",
 			os.path.join(PORTAGE_PYM_PATH, "portage/util/whirlpool.py")])
 		self.assertEqual(retval, os.EX_OK)

diff --git a/runtests.sh b/runtests.sh
index 1bd1234..86d34b6 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -67,7 +67,7 @@ for version in ${PYTHON_VERSIONS}; do
 	fi
 	if [[ -x "${executable}" ]]; then
 		echo -e "${GOOD}Testing with Python ${version}...${NORMAL}"
-		"${executable}" -bb -Wd pym/portage/tests/runTests "$@"
+		"${executable}" -b -Wd pym/portage/tests/runTests "$@"
 		status=$?
 		status_array[${#status_array[@]}]=${status}
 		found_versions[${#found_versions[@]}]=${version}

diff --git a/tabcheck.py b/tabcheck.py
index 7b5ea19..2d45cde 100755
--- a/tabcheck.py
+++ b/tabcheck.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -bbO
+#!/usr/bin/python -bO
 
 import tabnanny,sys
 


             reply	other threads:[~2014-01-23 21:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-23 21:36 Arfrever Frehtes Taifersar Arahesis [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-01-18 11:39 [gentoo-commits] proj/portage:master commit in: /, pym/portage/tests/dbapi/, pym/portage/tests/emerge/, bin/, pym/portage/tests/, Arfrever Frehtes Taifersar Arahesis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1390512861.d9094187a8d9185107e10e9005fc0fbe2139ae44.arfrever@gentoo \
    --to=arfrever@apache.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox