From 6e2bd52bb9f93142edd17b0badb2f2a76ea86a20 Mon Sep 17 00:00:00 2001
From: lxnay <lxnay@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Thu, 31 Jul 2008 08:29:08 +0000
Subject: [PATCH] Entropy/entropyTools: - removePackageOperators(): avoid
 crashing with malformed atom strings

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2315 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 libraries/entropy.py      |  6 ++++++
 libraries/entropyTools.py | 15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/libraries/entropy.py b/libraries/entropy.py
index c473db607..ea65156d3 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -13131,6 +13131,8 @@ class SocketHostInterface:
             p_args = args
             if cmd in self.HostInterface.login_pass_commands:
                 p_args = authenticator.hide_login_data(p_args)
+            elif cmd in self.HostInterface.raw_commands:
+                p_args = ['raw data']
             self.HostInterface.updateProgress(
                 '[from: %s] command validation :: called %s: length: %s, args: %s, session: %s, valid: %s, reason: %s' % (
                     self.client_address,
@@ -13223,6 +13225,8 @@ class SocketHostInterface:
             p_args = args
             if cmd in self.HostInterface.login_pass_commands:
                 p_args = authenticator.hide_login_data(p_args)
+            elif cmd in self.HostInterface.raw_commands:
+                p_args = ['raw data']
             self.HostInterface.updateProgress(
                 '[from: %s] run_task :: called %s: args: %s, session: %s' % (
                     self.client_address,
@@ -13268,6 +13272,8 @@ class SocketHostInterface:
             p_args = myargs
             if cmd in self.HostInterface.login_pass_commands:
                 p_args = authenticator.hide_login_data(p_args)
+            elif cmd in self.HostInterface.raw_commands:
+                p_args = ['raw data']
             self.HostInterface.updateProgress(
                 '[from: %s] called %s: args: %s, kwargs: %s' % (
                     self.client_address,
diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py
index 425608e02..828353fcd 100644
--- a/libraries/entropyTools.py
+++ b/libraries/entropyTools.py
@@ -1050,12 +1050,15 @@ def removePackageOperators(atom):
     if not atom:
         return atom
 
-    if atom[0] in [">","<"]:
-        atom = atom[1:]
-    if atom[0] == "=":
-        atom = atom[1:]
-    if atom[0] == "~":
-        atom = atom[1:]
+    try:
+        if atom[0] in [">","<"]:
+            atom = atom[1:]
+        if atom[0] == "=":
+            atom = atom[1:]
+        if atom[0] == "~":
+            atom = atom[1:]
+    except IndexError:
+        pass
 
     return atom