aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2014-01-18 12:38:31 +0100
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2014-01-18 12:38:31 +0100
commit08cd954a46def397ca7aa62e5f738cd2fa77a228 (patch)
tree152f24dfeebc8a23e79acef13cc8ec42f364767d /bin
parentAdd support for the following attributes in layout.conf to allow more (diff)
downloadportage-08cd954a46def397ca7aa62e5f738cd2fa77a228.tar.gz
portage-08cd954a46def397ca7aa62e5f738cd2fa77a228.tar.bz2
portage-08cd954a46def397ca7aa62e5f738cd2fa77a228.zip
Enable BytesWarnings.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/archive-conf4
-rwxr-xr-xbin/binhost-snapshot6
-rwxr-xr-xbin/check-implicit-pointer-usage.py2
-rwxr-xr-xbin/chpathtool.py2
-rwxr-xr-xbin/clean_locks10
-rwxr-xr-xbin/dispatch-conf4
-rwxr-xr-xbin/dohtml.py4
-rwxr-xr-xbin/ebuild4
-rwxr-xr-xbin/ebuild-ipc.py6
-rwxr-xr-xbin/egencache4
-rwxr-xr-xbin/emaint4
-rwxr-xr-xbin/emerge4
-rwxr-xr-xbin/emirrordist4
-rwxr-xr-xbin/env-update4
-rwxr-xr-xbin/filter-bash-environment.py4
-rwxr-xr-xbin/fixpackages4
-rwxr-xr-xbin/glsa-check6
-rwxr-xr-xbin/install.py6
-rwxr-xr-xbin/lock-helper.py4
-rwxr-xr-xbin/portageq4
-rwxr-xr-xbin/quickpkg4
-rwxr-xr-xbin/regenworld4
-rwxr-xr-xbin/repoman4
-rwxr-xr-xbin/xattr-helper.py4
-rwxr-xr-xbin/xpak-helper.py4
25 files changed, 55 insertions, 55 deletions
diff --git a/bin/archive-conf b/bin/archive-conf
index 2c34588c9..f513ff8d0 100755
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# 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 376080c05..1a140202f 100755
--- a/bin/binhost-snapshot
+++ b/bin/binhost-snapshot
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2010-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2010-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import io
@@ -31,7 +31,7 @@ def parse_args(argv):
usage += "\n\n"
for line in textwrap.wrap(prog_desc, 70):
- usage += line + "\n"
+ usage += line + "\n"
usage += "\n"
usage += "Required Arguments:\n\n"
diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py
index 8822c4504..863c3126f 100755
--- a/bin/check-implicit-pointer-usage.py
+++ b/bin/check-implicit-pointer-usage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python -bb
# 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 287644d4b..f5b2c67db 100755
--- a/bin/chpathtool.py
+++ b/bin/chpathtool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python -bb
# 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 184e80cb4..7d1040923 100755
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -1,5 +1,5 @@
-#!/usr/bin/python -O
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bbO
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
@@ -22,11 +22,11 @@ if not sys.argv[1:] or "--help" in sys.argv or "-h" in sys.argv:
print("%s --force %s/.locks" % (sys.argv[0], portage.settings["DISTDIR"]))
print()
sys.exit(1)
-
+
force = False
if "--force" in sys.argv[1:]:
force=True
-
+
for x in sys.argv[1:]:
if x == "--force":
continue
@@ -34,7 +34,7 @@ for x in sys.argv[1:]:
for y in portage.locks.hardlock_cleanup(x, remove_all_locks=force):
print(y)
print()
-
+
except OSError as e:
if e.errno in (errno.ENOENT, errno.ENOTDIR):
print("!!! %s is not a directory or does not exist" % x)
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 10455f444..6a818bf3b 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,5 +1,5 @@
-#!/usr/bin/python -O
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bbO
+# 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 f98557f61..1b8c92580 100755
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# 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 262dab6d8..2138aed33 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -1,5 +1,5 @@
-#!/usr/bin/python -O
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bbO
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index d351e9454..bbb6e8643 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2010-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2010-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
#
# This is a helper which ebuild processes can use
@@ -150,7 +150,7 @@ class EbuildIpc(object):
self._no_daemon_msg()
return 2
- buf = pipe_reader.getvalue()
+ buf = pipe_reader.getvalue()
retval = 2
diff --git a/bin/egencache b/bin/egencache
index 9b22363f0..2562d59fc 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2009-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2009-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# unicode_literals for compat with TextIOWrapper in Python 2
diff --git a/bin/emaint b/bin/emaint
index adf44d0df..c5415c3e3 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -1,5 +1,5 @@
-#!/usr/bin/python -O
-# Copyright 2005-2013 Gentoo Foundation
+#!/usr/bin/python -bbO
+# Copyright 2005-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
"""System health checks and maintenance utilities.
diff --git a/bin/emerge b/bin/emerge
index 4d9ea5a13..a415afa30 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2006-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2006-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
diff --git a/bin/emirrordist b/bin/emirrordist
index 8d93de9c0..2430aa7bd 100755
--- a/bin/emirrordist
+++ b/bin/emirrordist
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2013-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import sys
diff --git a/bin/env-update b/bin/env-update
index b500c545c..8e3b81cbf 100755
--- a/bin/env-update
+++ b/bin/env-update
@@ -1,5 +1,5 @@
-#!/usr/bin/python -O
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bbO
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py
index 3d4b3ecbb..838b422f7 100755
--- a/bin/filter-bash-environment.py
+++ b/bin/filter-bash-environment.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import codecs
diff --git a/bin/fixpackages b/bin/fixpackages
index e29d6eeff..3ec28321f 100755
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
diff --git a/bin/glsa-check b/bin/glsa-check
index 7fa3688aa..87eafca47 100755
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2008-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2008-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
@@ -244,7 +244,7 @@ if mode in ["dump", "fix", "inject", "pretend"]:
mergedict = {}
for (vuln, update) in myglsa.getAffectionTable(least_change=least_change):
mergedict.setdefault(update, []).append(vuln)
-
+
sys.stdout.write(">>> The following updates will be performed for this GLSA:\n")
for pkg in mergedict:
if pkg != "":
diff --git a/bin/install.py b/bin/install.py
index 2c6dfbe96..423ee42f2 100755
--- a/bin/install.py
+++ b/bin/install.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2013-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import os
@@ -61,7 +61,7 @@ def parse_args(args):
parser.add_argument(
"--owner",
"-o",
- action="store",
+ action="store",
dest="owner"
)
parser.add_argument(
diff --git a/bin/lock-helper.py b/bin/lock-helper.py
index 128e4ddd0..0c218352e 100755
--- a/bin/lock-helper.py
+++ b/bin/lock-helper.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2010-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2010-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import os
diff --git a/bin/portageq b/bin/portageq
index a50b8055c..59cc01953 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,5 +1,5 @@
-#!/usr/bin/python -O
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bbO
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function, unicode_literals
diff --git a/bin/quickpkg b/bin/quickpkg
index cf5800c2e..a3e2f5b20 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
diff --git a/bin/regenworld b/bin/regenworld
index f74b3dde0..239ea9a46 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
diff --git a/bin/repoman b/bin/repoman
index d1542e96b..1277f3644 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,5 +1,5 @@
-#!/usr/bin/python -O
-# Copyright 1999-2013 Gentoo Foundation
+#!/usr/bin/python -bbO
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Next to do: dep syntax checking in mask files
diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py
index 6d99521af..6525393c2 100755
--- a/bin/xattr-helper.py
+++ b/bin/xattr-helper.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2012-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2012-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
"""Dump and restore extended attributes.
diff --git a/bin/xpak-helper.py b/bin/xpak-helper.py
index d9d325d59..9fdc8ce8e 100755
--- a/bin/xpak-helper.py
+++ b/bin/xpak-helper.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright 2009-2013 Gentoo Foundation
+#!/usr/bin/python -bb
+# Copyright 2009-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import sys