[nanny] Fix md5 stuff at add_pkg_filter
- From: Roberto Majadas <telemaco src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nanny] Fix md5 stuff at add_pkg_filter
- Date: Sun, 23 Jan 2011 18:07:18 +0000 (UTC)
commit b817c364b744aa583cc046bdc5f78dc0937bc180
Author: Roberto Majadas <roberto majadas openshine com>
Date: Sun Jan 16 14:48:30 2011 +0100
Fix md5 stuff at add_pkg_filter
daemon/src/FilterManager.py | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/daemon/src/FilterManager.py b/daemon/src/FilterManager.py
index 2c233da..22edf24 100644
--- a/daemon/src/FilterManager.py
+++ b/daemon/src/FilterManager.py
@@ -241,7 +241,7 @@ class FilterManager (gobject.GObject) :
print "Categories cache from %s refresh" % pkg_id
def add_pkg_filter(self, url):
- pkg_id = hashlib.md5().hexdigest()
+ pkg_id = hashlib.md5(url).hexdigest()
if pkg_id in self.pkg_filters_conf.keys() :
return False
@@ -353,8 +353,12 @@ class FilterManager (gobject.GObject) :
def get_pkg_filter_metadata(self, pkg_id):
try:
if self.pkg_filters_conf[pkg_id]["pkg_info"].has_key("metadata"):
- ret = [self.pkg_filters_conf[pkg_id]["pkg_info"]["metadata"]["name"],
- self.pkg_filters_conf[pkg_id]["pkg_info"]["metadata"]["provider"]]
+ if self.pkg_filters_conf[pkg_id]["status"] == PKG_STATUS_INSTALLING :
+ ret = [self.pkg_filters_conf[pkg_id]["pkg_info"]["metadata"]["name"],
+ self.pkg_filters_conf[pkg_id]["pkg_info"]["metadata"]["provider"] + " (Installing new blacklist)"]
+ else:
+ ret = [self.pkg_filters_conf[pkg_id]["pkg_info"]["metadata"]["name"],
+ self.pkg_filters_conf[pkg_id]["pkg_info"]["metadata"]["provider"]]
return ret
except:
pass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]