diff --git a/libraries/entropy.py b/libraries/entropy.py index f9146e08a..2febf3040 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -5612,14 +5612,14 @@ class FtpInterface: continue self.Entropy.updateProgress( - "[ftp:%s] connecting with user: %s" % (bold(self.ftphost),blue(self.ftpuser),), + "[ftp:%s] connecting with user: %s" % (darkgreen(self.ftphost),blue(self.ftpuser),), importance = 1, type = "info", header = darkgreen(" * ") ) self.ftpconn.login(self.ftpuser,self.ftppassword) self.Entropy.updateProgress( - "[ftp:%s] switching to: %s" % (bold(self.ftphost),blue(self.ftpdir),), + "[ftp:%s] switching to: %s" % (darkgreen(self.ftphost),blue(self.ftpdir),), importance = 1, type = "info", header = darkgreen(" * ") @@ -5646,14 +5646,14 @@ class FtpInterface: raise continue self.Entropy.updateProgress( - "[ftp:%s] reconnecting with user: %s" % (bold(self.ftphost),blue(self.ftpuser),), + "[ftp:%s] reconnecting with user: %s" % (darkgreen(self.ftphost),blue(self.ftpuser),), importance = 1, type = "info", header = darkgreen(" * ") ) self.ftpconn.login(self.ftpuser,self.ftppassword) self.Entropy.updateProgress( - "[ftp:%s] switching to: %s" % (bold(self.ftphost),blue(self.ftpdir),), + "[ftp:%s] switching to: %s" % (darkgreen(self.ftphost),blue(self.ftpdir),), importance = 1, type = "info", header = darkgreen(" * ") @@ -5675,7 +5675,7 @@ class FtpInterface: def setCWD(self,mydir): self.Entropy.updateProgress( - "[ftp:%s] switching to: %s" % (bold(self.ftphost),blue(mydir),), + "[ftp:%s] switching to: %s" % (darkgreen(self.ftphost),blue(mydir),), importance = 1, type = "info", header = darkgreen(" * ") diff --git a/libraries/outputTools.py b/libraries/outputTools.py index afbaafa56..4d550d83a 100644 --- a/libraries/outputTools.py +++ b/libraries/outputTools.py @@ -36,8 +36,10 @@ except: stuff['cleanline'] = "" def setcols(): stuff['cleanline'] = "" - for x in range(stuff['cols']): + count = stuff['cols'] + while count: stuff['cleanline'] += ' ' + count -= 1 setcols() stuff['cursor'] = False stuff['ESC'] = chr(27) diff --git a/server/server_query.py b/server/server_query.py index 3eb4bc389..d5c73f0fa 100644 --- a/server/server_query.py +++ b/server/server_query.py @@ -39,9 +39,10 @@ def query(myopts): if cmd == "search": + dbconn = Entropy.openServerDatabase(just_reading = True) # open read only count = 0 - for mykeyword in mykeywords: + for mykeyword in myopts: results = dbconn.searchPackages(mykeyword) for result in results: count += 1