| 1 |
commit: d9094187a8d9185107e10e9005fc0fbe2139ae44 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Thu Jan 23 21:34:21 2014 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org> |
| 5 |
CommitDate: Thu Jan 23 21:34:21 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d9094187 |
| 7 |
|
| 8 |
Use -b instead of -bb. |
| 9 |
(-bb can trigger errors, depending on Python version and environment.) |
| 10 |
|
| 11 |
--- |
| 12 |
bin/archive-conf | 2 +- |
| 13 |
bin/binhost-snapshot | 2 +- |
| 14 |
bin/check-implicit-pointer-usage.py | 2 +- |
| 15 |
bin/chpathtool.py | 2 +- |
| 16 |
bin/clean_locks | 2 +- |
| 17 |
bin/dispatch-conf | 2 +- |
| 18 |
bin/dohtml.py | 2 +- |
| 19 |
bin/ebuild | 2 +- |
| 20 |
bin/ebuild-ipc.py | 2 +- |
| 21 |
bin/egencache | 2 +- |
| 22 |
bin/emaint | 2 +- |
| 23 |
bin/emerge | 2 +- |
| 24 |
bin/emirrordist | 2 +- |
| 25 |
bin/env-update | 2 +- |
| 26 |
bin/filter-bash-environment.py | 2 +- |
| 27 |
bin/fixpackages | 2 +- |
| 28 |
bin/glsa-check | 2 +- |
| 29 |
bin/install.py | 2 +- |
| 30 |
bin/lock-helper.py | 2 +- |
| 31 |
bin/portageq | 2 +- |
| 32 |
bin/quickpkg | 2 +- |
| 33 |
bin/regenworld | 2 +- |
| 34 |
bin/repoman | 2 +- |
| 35 |
bin/xattr-helper.py | 2 +- |
| 36 |
bin/xpak-helper.py | 2 +- |
| 37 |
pym/portage/tests/dbapi/test_portdb_cache.py | 8 ++++---- |
| 38 |
pym/portage/tests/emerge/test_emerge_slot_abi.py | 4 ++-- |
| 39 |
pym/portage/tests/emerge/test_simple.py | 20 ++++++++++---------- |
| 40 |
pym/portage/tests/repoman/test_simple.py | 2 +- |
| 41 |
pym/portage/tests/runTests | 2 +- |
| 42 |
pym/portage/tests/util/test_whirlpool.py | 2 +- |
| 43 |
runtests.sh | 2 +- |
| 44 |
tabcheck.py | 2 +- |
| 45 |
33 files changed, 46 insertions(+), 46 deletions(-) |
| 46 |
|
| 47 |
diff --git a/bin/archive-conf b/bin/archive-conf |
| 48 |
index f513ff8..f73ca42 100755 |
| 49 |
--- a/bin/archive-conf |
| 50 |
+++ b/bin/archive-conf |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-#!/usr/bin/python -bb |
| 53 |
+#!/usr/bin/python -b |
| 54 |
# Copyright 1999-2014 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
|
| 58 |
diff --git a/bin/binhost-snapshot b/bin/binhost-snapshot |
| 59 |
index 1a14020..c2204f0 100755 |
| 60 |
--- a/bin/binhost-snapshot |
| 61 |
+++ b/bin/binhost-snapshot |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-#!/usr/bin/python -bb |
| 64 |
+#!/usr/bin/python -b |
| 65 |
# Copyright 2010-2014 Gentoo Foundation |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py |
| 70 |
index 863c312..242436c 100755 |
| 71 |
--- a/bin/check-implicit-pointer-usage.py |
| 72 |
+++ b/bin/check-implicit-pointer-usage.py |
| 73 |
@@ -1,4 +1,4 @@ |
| 74 |
-#!/usr/bin/python -bb |
| 75 |
+#!/usr/bin/python -b |
| 76 |
|
| 77 |
# Ripped from HP and updated from Debian |
| 78 |
# Update by Gentoo to support unicode output |
| 79 |
|
| 80 |
diff --git a/bin/chpathtool.py b/bin/chpathtool.py |
| 81 |
index f5b2c67..6460662 100755 |
| 82 |
--- a/bin/chpathtool.py |
| 83 |
+++ b/bin/chpathtool.py |
| 84 |
@@ -1,4 +1,4 @@ |
| 85 |
-#!/usr/bin/python -bb |
| 86 |
+#!/usr/bin/python -b |
| 87 |
# Copyright 2011-2014 Gentoo Foundation |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
|
| 90 |
|
| 91 |
diff --git a/bin/clean_locks b/bin/clean_locks |
| 92 |
index 7d10409..3e969f2 100755 |
| 93 |
--- a/bin/clean_locks |
| 94 |
+++ b/bin/clean_locks |
| 95 |
@@ -1,4 +1,4 @@ |
| 96 |
-#!/usr/bin/python -bbO |
| 97 |
+#!/usr/bin/python -bO |
| 98 |
# Copyright 1999-2014 Gentoo Foundation |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
|
| 101 |
|
| 102 |
diff --git a/bin/dispatch-conf b/bin/dispatch-conf |
| 103 |
index 6a818bf..4b0c0ac 100755 |
| 104 |
--- a/bin/dispatch-conf |
| 105 |
+++ b/bin/dispatch-conf |
| 106 |
@@ -1,4 +1,4 @@ |
| 107 |
-#!/usr/bin/python -bbO |
| 108 |
+#!/usr/bin/python -bO |
| 109 |
# Copyright 1999-2014 Gentoo Foundation |
| 110 |
# Distributed under the terms of the GNU General Public License v2 |
| 111 |
|
| 112 |
|
| 113 |
diff --git a/bin/dohtml.py b/bin/dohtml.py |
| 114 |
index 1b8c925..5359f5e 100755 |
| 115 |
--- a/bin/dohtml.py |
| 116 |
+++ b/bin/dohtml.py |
| 117 |
@@ -1,4 +1,4 @@ |
| 118 |
-#!/usr/bin/python -bb |
| 119 |
+#!/usr/bin/python -b |
| 120 |
# Copyright 1999-2014 Gentoo Foundation |
| 121 |
# Distributed under the terms of the GNU General Public License v2 |
| 122 |
|
| 123 |
|
| 124 |
diff --git a/bin/ebuild b/bin/ebuild |
| 125 |
index 2138aed..8f4b103 100755 |
| 126 |
--- a/bin/ebuild |
| 127 |
+++ b/bin/ebuild |
| 128 |
@@ -1,4 +1,4 @@ |
| 129 |
-#!/usr/bin/python -bbO |
| 130 |
+#!/usr/bin/python -bO |
| 131 |
# Copyright 1999-2014 Gentoo Foundation |
| 132 |
# Distributed under the terms of the GNU General Public License v2 |
| 133 |
|
| 134 |
|
| 135 |
diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py |
| 136 |
index bbb6e86..00337ee 100755 |
| 137 |
--- a/bin/ebuild-ipc.py |
| 138 |
+++ b/bin/ebuild-ipc.py |
| 139 |
@@ -1,4 +1,4 @@ |
| 140 |
-#!/usr/bin/python -bb |
| 141 |
+#!/usr/bin/python -b |
| 142 |
# Copyright 2010-2014 Gentoo Foundation |
| 143 |
# Distributed under the terms of the GNU General Public License v2 |
| 144 |
# |
| 145 |
|
| 146 |
diff --git a/bin/egencache b/bin/egencache |
| 147 |
index 2562d59..c14be93 100755 |
| 148 |
--- a/bin/egencache |
| 149 |
+++ b/bin/egencache |
| 150 |
@@ -1,4 +1,4 @@ |
| 151 |
-#!/usr/bin/python -bb |
| 152 |
+#!/usr/bin/python -b |
| 153 |
# Copyright 2009-2014 Gentoo Foundation |
| 154 |
# Distributed under the terms of the GNU General Public License v2 |
| 155 |
|
| 156 |
|
| 157 |
diff --git a/bin/emaint b/bin/emaint |
| 158 |
index c5415c3..aeeb183 100755 |
| 159 |
--- a/bin/emaint |
| 160 |
+++ b/bin/emaint |
| 161 |
@@ -1,4 +1,4 @@ |
| 162 |
-#!/usr/bin/python -bbO |
| 163 |
+#!/usr/bin/python -bO |
| 164 |
# Copyright 2005-2014 Gentoo Foundation |
| 165 |
# Distributed under the terms of the GNU General Public License v2 |
| 166 |
|
| 167 |
|
| 168 |
diff --git a/bin/emerge b/bin/emerge |
| 169 |
index a415afa..bb93d83 100755 |
| 170 |
--- a/bin/emerge |
| 171 |
+++ b/bin/emerge |
| 172 |
@@ -1,4 +1,4 @@ |
| 173 |
-#!/usr/bin/python -bb |
| 174 |
+#!/usr/bin/python -b |
| 175 |
# Copyright 2006-2014 Gentoo Foundation |
| 176 |
# Distributed under the terms of the GNU General Public License v2 |
| 177 |
|
| 178 |
|
| 179 |
diff --git a/bin/emirrordist b/bin/emirrordist |
| 180 |
index 2430aa7..0368eee 100755 |
| 181 |
--- a/bin/emirrordist |
| 182 |
+++ b/bin/emirrordist |
| 183 |
@@ -1,4 +1,4 @@ |
| 184 |
-#!/usr/bin/python -bb |
| 185 |
+#!/usr/bin/python -b |
| 186 |
# Copyright 2013-2014 Gentoo Foundation |
| 187 |
# Distributed under the terms of the GNU General Public License v2 |
| 188 |
|
| 189 |
|
| 190 |
diff --git a/bin/env-update b/bin/env-update |
| 191 |
index 8e3b81c..7651ef9 100755 |
| 192 |
--- a/bin/env-update |
| 193 |
+++ b/bin/env-update |
| 194 |
@@ -1,4 +1,4 @@ |
| 195 |
-#!/usr/bin/python -bbO |
| 196 |
+#!/usr/bin/python -bO |
| 197 |
# Copyright 1999-2014 Gentoo Foundation |
| 198 |
# Distributed under the terms of the GNU General Public License v2 |
| 199 |
|
| 200 |
|
| 201 |
diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py |
| 202 |
index 838b422..a4cdc54 100755 |
| 203 |
--- a/bin/filter-bash-environment.py |
| 204 |
+++ b/bin/filter-bash-environment.py |
| 205 |
@@ -1,4 +1,4 @@ |
| 206 |
-#!/usr/bin/python -bb |
| 207 |
+#!/usr/bin/python -b |
| 208 |
# Copyright 1999-2014 Gentoo Foundation |
| 209 |
# Distributed under the terms of the GNU General Public License v2 |
| 210 |
|
| 211 |
|
| 212 |
diff --git a/bin/fixpackages b/bin/fixpackages |
| 213 |
index 3ec2832..cec0030 100755 |
| 214 |
--- a/bin/fixpackages |
| 215 |
+++ b/bin/fixpackages |
| 216 |
@@ -1,4 +1,4 @@ |
| 217 |
-#!/usr/bin/python -bb |
| 218 |
+#!/usr/bin/python -b |
| 219 |
# Copyright 1999-2014 Gentoo Foundation |
| 220 |
# Distributed under the terms of the GNU General Public License v2 |
| 221 |
|
| 222 |
|
| 223 |
diff --git a/bin/glsa-check b/bin/glsa-check |
| 224 |
index 87eafca..972679a 100755 |
| 225 |
--- a/bin/glsa-check |
| 226 |
+++ b/bin/glsa-check |
| 227 |
@@ -1,4 +1,4 @@ |
| 228 |
-#!/usr/bin/python -bb |
| 229 |
+#!/usr/bin/python -b |
| 230 |
# Copyright 2008-2014 Gentoo Foundation |
| 231 |
# Distributed under the terms of the GNU General Public License v2 |
| 232 |
|
| 233 |
|
| 234 |
diff --git a/bin/install.py b/bin/install.py |
| 235 |
index 423ee42..3c5e0de 100755 |
| 236 |
--- a/bin/install.py |
| 237 |
+++ b/bin/install.py |
| 238 |
@@ -1,4 +1,4 @@ |
| 239 |
-#!/usr/bin/python -bb |
| 240 |
+#!/usr/bin/python -b |
| 241 |
# Copyright 2013-2014 Gentoo Foundation |
| 242 |
# Distributed under the terms of the GNU General Public License v2 |
| 243 |
|
| 244 |
|
| 245 |
diff --git a/bin/lock-helper.py b/bin/lock-helper.py |
| 246 |
index 0c21835..aa2dd60 100755 |
| 247 |
--- a/bin/lock-helper.py |
| 248 |
+++ b/bin/lock-helper.py |
| 249 |
@@ -1,4 +1,4 @@ |
| 250 |
-#!/usr/bin/python -bb |
| 251 |
+#!/usr/bin/python -b |
| 252 |
# Copyright 2010-2014 Gentoo Foundation |
| 253 |
# Distributed under the terms of the GNU General Public License v2 |
| 254 |
|
| 255 |
|
| 256 |
diff --git a/bin/portageq b/bin/portageq |
| 257 |
index 59cc019..79818f6 100755 |
| 258 |
--- a/bin/portageq |
| 259 |
+++ b/bin/portageq |
| 260 |
@@ -1,4 +1,4 @@ |
| 261 |
-#!/usr/bin/python -bbO |
| 262 |
+#!/usr/bin/python -bO |
| 263 |
# Copyright 1999-2014 Gentoo Foundation |
| 264 |
# Distributed under the terms of the GNU General Public License v2 |
| 265 |
|
| 266 |
|
| 267 |
diff --git a/bin/quickpkg b/bin/quickpkg |
| 268 |
index a3e2f5b..90277ad 100755 |
| 269 |
--- a/bin/quickpkg |
| 270 |
+++ b/bin/quickpkg |
| 271 |
@@ -1,4 +1,4 @@ |
| 272 |
-#!/usr/bin/python -bb |
| 273 |
+#!/usr/bin/python -b |
| 274 |
# Copyright 1999-2014 Gentoo Foundation |
| 275 |
# Distributed under the terms of the GNU General Public License v2 |
| 276 |
|
| 277 |
|
| 278 |
diff --git a/bin/regenworld b/bin/regenworld |
| 279 |
index 239ea9a..32e8e5c 100755 |
| 280 |
--- a/bin/regenworld |
| 281 |
+++ b/bin/regenworld |
| 282 |
@@ -1,4 +1,4 @@ |
| 283 |
-#!/usr/bin/python -bb |
| 284 |
+#!/usr/bin/python -b |
| 285 |
# Copyright 1999-2014 Gentoo Foundation |
| 286 |
# Distributed under the terms of the GNU General Public License v2 |
| 287 |
|
| 288 |
|
| 289 |
diff --git a/bin/repoman b/bin/repoman |
| 290 |
index 1277f36..3504b6b 100755 |
| 291 |
--- a/bin/repoman |
| 292 |
+++ b/bin/repoman |
| 293 |
@@ -1,4 +1,4 @@ |
| 294 |
-#!/usr/bin/python -bbO |
| 295 |
+#!/usr/bin/python -bO |
| 296 |
# Copyright 1999-2014 Gentoo Foundation |
| 297 |
# Distributed under the terms of the GNU General Public License v2 |
| 298 |
|
| 299 |
|
| 300 |
diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py |
| 301 |
index 6525393..ea83a5e 100755 |
| 302 |
--- a/bin/xattr-helper.py |
| 303 |
+++ b/bin/xattr-helper.py |
| 304 |
@@ -1,4 +1,4 @@ |
| 305 |
-#!/usr/bin/python -bb |
| 306 |
+#!/usr/bin/python -b |
| 307 |
# Copyright 2012-2014 Gentoo Foundation |
| 308 |
# Distributed under the terms of the GNU General Public License v2 |
| 309 |
|
| 310 |
|
| 311 |
diff --git a/bin/xpak-helper.py b/bin/xpak-helper.py |
| 312 |
index 9fdc8ce..c4391cd 100755 |
| 313 |
--- a/bin/xpak-helper.py |
| 314 |
+++ b/bin/xpak-helper.py |
| 315 |
@@ -1,4 +1,4 @@ |
| 316 |
-#!/usr/bin/python -bb |
| 317 |
+#!/usr/bin/python -b |
| 318 |
# Copyright 2009-2014 Gentoo Foundation |
| 319 |
# Distributed under the terms of the GNU General Public License v2 |
| 320 |
|
| 321 |
|
| 322 |
diff --git a/pym/portage/tests/dbapi/test_portdb_cache.py b/pym/portage/tests/dbapi/test_portdb_cache.py |
| 323 |
index e04d8de..94af96e 100644 |
| 324 |
--- a/pym/portage/tests/dbapi/test_portdb_cache.py |
| 325 |
+++ b/pym/portage/tests/dbapi/test_portdb_cache.py |
| 326 |
@@ -37,11 +37,11 @@ class PortdbCacheTestCase(TestCase): |
| 327 |
layout_conf_path = os.path.join(metadata_dir, "layout.conf") |
| 328 |
|
| 329 |
portage_python = portage._python_interpreter |
| 330 |
- egencache_cmd = (portage_python, "-bb", "-Wd", |
| 331 |
+ egencache_cmd = (portage_python, "-b", "-Wd", |
| 332 |
os.path.join(PORTAGE_BIN_PATH, "egencache"), |
| 333 |
"--repo", "test_repo", |
| 334 |
"--repositories-configuration", settings.repositories.config_string()) |
| 335 |
- python_cmd = (portage_python, "-bb", "-Wd", "-c") |
| 336 |
+ python_cmd = (portage_python, "-b", "-Wd", "-c") |
| 337 |
|
| 338 |
test_commands = ( |
| 339 |
(lambda: not os.path.exists(pms_cache_dir),), |
| 340 |
@@ -89,12 +89,12 @@ class PortdbCacheTestCase(TestCase): |
| 341 |
(BASH_BINARY, "-c", "echo %s > %s" % |
| 342 |
tuple(map(portage._shell_quote, |
| 343 |
("cache-formats = pms md5-dict", layout_conf_path,)))), |
| 344 |
- (portage_python, "-bb", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent(""" |
| 345 |
+ (portage_python, "-b", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent(""" |
| 346 |
import os, sys, portage |
| 347 |
if portage.portdb.porttree_root not in portage.portdb._pregen_auxdb: |
| 348 |
sys.exit(1) |
| 349 |
"""),), |
| 350 |
- (portage_python, "-bb", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent(""" |
| 351 |
+ (portage_python, "-b", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent(""" |
| 352 |
import os, sys, portage |
| 353 |
from portage.cache.metadata import database as pms_database |
| 354 |
if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.porttree_root], pms_database): |
| 355 |
|
| 356 |
diff --git a/pym/portage/tests/emerge/test_emerge_slot_abi.py b/pym/portage/tests/emerge/test_emerge_slot_abi.py |
| 357 |
index e73ebc5..fd7ec0e 100644 |
| 358 |
--- a/pym/portage/tests/emerge/test_emerge_slot_abi.py |
| 359 |
+++ b/pym/portage/tests/emerge/test_emerge_slot_abi.py |
| 360 |
@@ -69,9 +69,9 @@ class SlotAbiEmergeTestCase(TestCase): |
| 361 |
package_mask_path = os.path.join(user_config_dir, "package.mask") |
| 362 |
|
| 363 |
portage_python = portage._python_interpreter |
| 364 |
- ebuild_cmd = (portage_python, "-bb", "-Wd", |
| 365 |
+ ebuild_cmd = (portage_python, "-b", "-Wd", |
| 366 |
os.path.join(PORTAGE_BIN_PATH, "ebuild")) |
| 367 |
- emerge_cmd = (portage_python, "-bb", "-Wd", |
| 368 |
+ emerge_cmd = (portage_python, "-b", "-Wd", |
| 369 |
os.path.join(PORTAGE_BIN_PATH, "emerge")) |
| 370 |
|
| 371 |
test_ebuild = portdb.findname("dev-libs/dbus-glib-0.98") |
| 372 |
|
| 373 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
| 374 |
index 2016ae6..d3bb866 100644 |
| 375 |
--- a/pym/portage/tests/emerge/test_simple.py |
| 376 |
+++ b/pym/portage/tests/emerge/test_simple.py |
| 377 |
@@ -174,29 +174,29 @@ pkg_preinst() { |
| 378 |
cachedir_pregen = os.path.join(test_repo_location, "metadata", "md5-cache") |
| 379 |
|
| 380 |
portage_python = portage._python_interpreter |
| 381 |
- dispatch_conf_cmd = (portage_python, "-bb", "-Wd", |
| 382 |
+ dispatch_conf_cmd = (portage_python, "-b", "-Wd", |
| 383 |
os.path.join(PORTAGE_BIN_PATH, "dispatch-conf")) |
| 384 |
- ebuild_cmd = (portage_python, "-bb", "-Wd", |
| 385 |
+ ebuild_cmd = (portage_python, "-b", "-Wd", |
| 386 |
os.path.join(PORTAGE_BIN_PATH, "ebuild")) |
| 387 |
- egencache_cmd = (portage_python, "-bb", "-Wd", |
| 388 |
+ egencache_cmd = (portage_python, "-b", "-Wd", |
| 389 |
os.path.join(PORTAGE_BIN_PATH, "egencache"), |
| 390 |
"--repo", "test_repo", |
| 391 |
"--repositories-configuration", settings.repositories.config_string()) |
| 392 |
- emerge_cmd = (portage_python, "-bb", "-Wd", |
| 393 |
+ emerge_cmd = (portage_python, "-b", "-Wd", |
| 394 |
os.path.join(PORTAGE_BIN_PATH, "emerge")) |
| 395 |
- emaint_cmd = (portage_python, "-bb", "-Wd", |
| 396 |
+ emaint_cmd = (portage_python, "-b", "-Wd", |
| 397 |
os.path.join(PORTAGE_BIN_PATH, "emaint")) |
| 398 |
- env_update_cmd = (portage_python, "-bb", "-Wd", |
| 399 |
+ env_update_cmd = (portage_python, "-b", "-Wd", |
| 400 |
os.path.join(PORTAGE_BIN_PATH, "env-update")) |
| 401 |
etc_update_cmd = (BASH_BINARY, |
| 402 |
os.path.join(PORTAGE_BIN_PATH, "etc-update")) |
| 403 |
- fixpackages_cmd = (portage_python, "-bb", "-Wd", |
| 404 |
+ fixpackages_cmd = (portage_python, "-b", "-Wd", |
| 405 |
os.path.join(PORTAGE_BIN_PATH, "fixpackages")) |
| 406 |
- portageq_cmd = (portage_python, "-bb", "-Wd", |
| 407 |
+ portageq_cmd = (portage_python, "-b", "-Wd", |
| 408 |
os.path.join(PORTAGE_BIN_PATH, "portageq")) |
| 409 |
- quickpkg_cmd = (portage_python, "-bb", "-Wd", |
| 410 |
+ quickpkg_cmd = (portage_python, "-b", "-Wd", |
| 411 |
os.path.join(PORTAGE_BIN_PATH, "quickpkg")) |
| 412 |
- regenworld_cmd = (portage_python, "-bb", "-Wd", |
| 413 |
+ regenworld_cmd = (portage_python, "-b", "-Wd", |
| 414 |
os.path.join(PORTAGE_BIN_PATH, "regenworld")) |
| 415 |
|
| 416 |
rm_binary = find_binary("rm") |
| 417 |
|
| 418 |
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py |
| 419 |
index 9fc6d83..69eb36d 100644 |
| 420 |
--- a/pym/portage/tests/repoman/test_simple.py |
| 421 |
+++ b/pym/portage/tests/repoman/test_simple.py |
| 422 |
@@ -170,7 +170,7 @@ class SimpleRepomanTestCase(TestCase): |
| 423 |
profiles_dir = os.path.join(test_repo_location, "profiles") |
| 424 |
license_dir = os.path.join(test_repo_location, "licenses") |
| 425 |
|
| 426 |
- repoman_cmd = (portage._python_interpreter, "-bb", "-Wd", |
| 427 |
+ repoman_cmd = (portage._python_interpreter, "-b", "-Wd", |
| 428 |
os.path.join(PORTAGE_BIN_PATH, "repoman")) |
| 429 |
|
| 430 |
git_binary = find_binary("git") |
| 431 |
|
| 432 |
diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests |
| 433 |
index 5869f37..9c45276 100755 |
| 434 |
--- a/pym/portage/tests/runTests |
| 435 |
+++ b/pym/portage/tests/runTests |
| 436 |
@@ -1,4 +1,4 @@ |
| 437 |
-#!/usr/bin/python -bbWd |
| 438 |
+#!/usr/bin/python -bWd |
| 439 |
# runTests.py -- Portage Unit Test Functionality |
| 440 |
# Copyright 2006-2014 Gentoo Foundation |
| 441 |
# Distributed under the terms of the GNU General Public License v2 |
| 442 |
|
| 443 |
diff --git a/pym/portage/tests/util/test_whirlpool.py b/pym/portage/tests/util/test_whirlpool.py |
| 444 |
index ac78d97..fbe7cae 100644 |
| 445 |
--- a/pym/portage/tests/util/test_whirlpool.py |
| 446 |
+++ b/pym/portage/tests/util/test_whirlpool.py |
| 447 |
@@ -11,6 +11,6 @@ from portage.tests import TestCase |
| 448 |
class WhirlpoolTestCase(TestCase): |
| 449 |
def testBundledWhirlpool(self): |
| 450 |
# execute the tests bundled with the whirlpool module |
| 451 |
- retval = subprocess.call([portage._python_interpreter, "-bb", "-Wd", |
| 452 |
+ retval = subprocess.call([portage._python_interpreter, "-b", "-Wd", |
| 453 |
os.path.join(PORTAGE_PYM_PATH, "portage/util/whirlpool.py")]) |
| 454 |
self.assertEqual(retval, os.EX_OK) |
| 455 |
|
| 456 |
diff --git a/runtests.sh b/runtests.sh |
| 457 |
index 1bd1234..86d34b6 100755 |
| 458 |
--- a/runtests.sh |
| 459 |
+++ b/runtests.sh |
| 460 |
@@ -67,7 +67,7 @@ for version in ${PYTHON_VERSIONS}; do |
| 461 |
fi |
| 462 |
if [[ -x "${executable}" ]]; then |
| 463 |
echo -e "${GOOD}Testing with Python ${version}...${NORMAL}" |
| 464 |
- "${executable}" -bb -Wd pym/portage/tests/runTests "$@" |
| 465 |
+ "${executable}" -b -Wd pym/portage/tests/runTests "$@" |
| 466 |
status=$? |
| 467 |
status_array[${#status_array[@]}]=${status} |
| 468 |
found_versions[${#found_versions[@]}]=${version} |
| 469 |
|
| 470 |
diff --git a/tabcheck.py b/tabcheck.py |
| 471 |
index 7b5ea19..2d45cde 100755 |
| 472 |
--- a/tabcheck.py |
| 473 |
+++ b/tabcheck.py |
| 474 |
@@ -1,4 +1,4 @@ |
| 475 |
-#!/usr/bin/python -bbO |
| 476 |
+#!/usr/bin/python -bO |
| 477 |
|
| 478 |
import tabnanny,sys |
Archives