From 09dc32b71ee19aaf35bc22941dfa07876b9377ed Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Wed, 20 Feb 2008 14:35:35 +0000 Subject: [PATCH] - moved package masking files to *.example - some cosmetical updates - updated TODO git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1260 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- TODO | 1 + .../{package.keywords => package.keywords.example} | 0 conf/packages/{package.mask => package.mask.example} | 0 .../{package.unmask => package.unmask.example} | 0 conf/packages/packages.db.lic_whitelist | 11 +++++++++++ libraries/databaseTools.py | 6 ++++-- 6 files changed, 16 insertions(+), 2 deletions(-) rename conf/packages/{package.keywords => package.keywords.example} (100%) rename conf/packages/{package.mask => package.mask.example} (100%) rename conf/packages/{package.unmask => package.unmask.example} (100%) create mode 100644 conf/packages/packages.db.lic_whitelist diff --git a/TODO b/TODO index bde8ea207..0bdcf7a14 100644 --- a/TODO +++ b/TODO @@ -19,6 +19,7 @@ TODO list: - add masking menu - use availability bool to show masked packages and connect the masking menu - Popularity feature + - GLSA interface Project Status: diff --git a/conf/packages/package.keywords b/conf/packages/package.keywords.example similarity index 100% rename from conf/packages/package.keywords rename to conf/packages/package.keywords.example diff --git a/conf/packages/package.mask b/conf/packages/package.mask.example similarity index 100% rename from conf/packages/package.mask rename to conf/packages/package.mask.example diff --git a/conf/packages/package.unmask b/conf/packages/package.unmask.example similarity index 100% rename from conf/packages/package.unmask rename to conf/packages/package.unmask.example diff --git a/conf/packages/packages.db.lic_whitelist b/conf/packages/packages.db.lic_whitelist new file mode 100644 index 000000000..3bc8a0a30 --- /dev/null +++ b/conf/packages/packages.db.lic_whitelist @@ -0,0 +1,11 @@ +# Server side packages.db.lic_whitelist file, to allow whitelisting license confirmation requests +# +# In this file you can specify Gentoo license identifiers (/usr/portage/licenses) + +# LINE CONSTRUCTION: +# +# See examples below + +# EXAMPLES: +# GPL-2 +# GPL-3 diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py index bb2b3ac68..0ce8b6199 100644 --- a/libraries/databaseTools.py +++ b/libraries/databaseTools.py @@ -3270,7 +3270,8 @@ class etpDatabase: red("Exporting database table ")+"["+blue(str(name))+"]", importance = 0, type = "info", - back = True + back = True, + header = " " ) if name == "sqlite_sequence": @@ -3304,7 +3305,8 @@ class etpDatabase: self.updateProgress( red("Database Export completed."), importance = 0, - type = "info" + type = "info", + header = " " ) # remember to close the file