From 5fceb3cfa793c6905fa9eb4dfa547f4629692a5e Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Sat, 23 Feb 2008 15:08:20 +0000
Subject: [PATCH] fixed portage bashrc and some other cosmetical stuff

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1282 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 client/equo               | 2 +-
 conf/etc-portage-bashrc   | 2 +-
 libraries/entropyTools.py | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/client/equo b/client/equo
index 8ab0ed256..620c54d39 100644
--- a/client/equo
+++ b/client/equo
@@ -402,7 +402,7 @@ except Exception:
     conntest = entropyTools.get_remote_data(etpConst['conntestlink'])
     if (conntest != False):
         print_error(darkgreen("Of course you are on the Internet..."))
-        rc = Text.askQuestion("   Erm... Can I send the error to my creators so they can fix me? (Your IP will be logged)")
+        rc = Text.askQuestion("   Erm... Can I send the error, along with some information about your hardware to my creators so they can fix me? (Your IP will be logged)")
         if rc == "No":
             print_error(darkgreen("Ok, ok ok ok... Sorry!"))
             sys.exit(2)
diff --git a/conf/etc-portage-bashrc b/conf/etc-portage-bashrc
index dad8b825f..5cf819d30 100644
--- a/conf/etc-portage-bashrc
+++ b/conf/etc-portage-bashrc
@@ -1,5 +1,5 @@
 post_pkg_postrm() {
-        if [ "$SKIP_EQUO_SYNC" != "1" ] || [ -z "$ENTROPY_SERVER_SIDE" ]; then
+        if [ -z "$SKIP_EQUO_SYNC" ]; then
                 equo database gentoosync
         fi
 }
diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py
index 228a8e674..a458d6b92 100644
--- a/libraries/entropyTools.py
+++ b/libraries/entropyTools.py
@@ -1236,11 +1236,8 @@ def uncompressTarBz2(filepath, extractPath = None, catchEmpty = False):
             try:
                 tarinfo.name = tarinfo.name.encode(sys.getfilesystemencoding())
             except:  # default encoding failed
-                try:
-                    tarinfo.name = tarinfo.name.decode("latin1") # try to convert to latin1 and then back to sys.getfilesystemencoding()
-                    tarinfo.name = tarinfo.name.encode(sys.getfilesystemencoding())
-                except:
-                    raise
+                tarinfo.name = tarinfo.name.decode("latin1") # try to convert to latin1 and then back to sys.getfilesystemencoding()
+                tarinfo.name = tarinfo.name.encode(sys.getfilesystemencoding())
             tar.extract(tarinfo, extractPath.encode(sys.getfilesystemencoding()))
         del tar.members[:]