summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-09-06 16:05:46 +0200
committerZac Medico <zmedico@gentoo.org>2010-09-06 10:39:07 -0700
commit46cafb3996d827d208d486b85c7f4248a6e8c826 (patch)
treef048bffbad0a9bf148e17ab4f6803981c202da7f /pym
parent7cba4cf96291fddb6a93586caef1328008a3ac5d (diff)
downloadportage-46cafb3996d827d208d486b85c7f4248a6e8c826.tar.gz
portage-46cafb3996d827d208d486b85c7f4248a6e8c826.tar.bz2
portage-46cafb3996d827d208d486b85c7f4248a6e8c826.zip
Remove all \a (alert/bell/beep) tokens (bug 336024)
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/unmerge.py4
-rw-r--r--pym/portage/package/ebuild/config.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index 8e26e6256..e1d400f81 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -427,10 +427,10 @@ def unmerge(root_config, myopts, unmerge_action,
#avoid cluttering the preview printout with stuff that isn't getting unmerged
continue
if not (pkgmap[x]["protected"] or pkgmap[x]["omitted"]) and cp in syslist:
- writemsg_level(colorize("BAD","\a\n\n!!! " + \
+ writemsg_level(colorize("BAD","\n\n!!! " + \
"'%s' is part of your system profile.\n" % cp),
level=logging.WARNING, noiselevel=-1)
- writemsg_level(colorize("WARN","\a!!! Unmerging it may " + \
+ writemsg_level(colorize("WARN","!!! Unmerging it may " + \
"be damaging to your system.\n\n"),
level=logging.WARNING, noiselevel=-1)
if clean_delay and "--pretend" not in myopts and "--ask" not in myopts:
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 2f0958e2d..84cf2e022 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -889,7 +889,7 @@ class config(object):
if not self.profile_path or (not os.path.islink(abs_profile_path) and \
not os.path.exists(os.path.join(abs_profile_path, "parent")) and \
os.path.exists(os.path.join(self["PORTDIR"], "profiles"))):
- writemsg(_("\a\n\n!!! %s is not a symlink and will probably prevent most merges.\n") % abs_profile_path,
+ writemsg(_("\n\n!!! %s is not a symlink and will probably prevent most merges.\n") % abs_profile_path,
noiselevel=-1)
writemsg(_("!!! It should point into a profile within %s/profiles/\n") % self["PORTDIR"])
writemsg(_("!!! (You can safely ignore this message when syncing. It's harmless.)\n\n\n"))