[PackageKit-commit] packagekit: Branch 'master' - 12 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Tue Apr 15 10:43:43 PDT 2008
backends/poldek/pk-backend-poldek.c | 9 +
backends/yum/helpers/yumBackend.py | 134 ++++++++++++++++++----------
backends/zypp/pk-backend-zypp.cpp | 24 +++--
client/pk-console.c | 5 -
data/95packagekit | 2
docs/html/img/pk-added-deps.png |binary
libpackagekit/pk-client.c | 15 +++
libpackagekit/pk-enum.c | 1
libpackagekit/pk-enum.h | 1
policy/org.freedesktop.packagekit.policy.in | 4
src/pk-transaction-db.c | 2
11 files changed, 140 insertions(+), 57 deletions(-)
New commits:
commit 8ed5a031f712eefdd5af4dfd06252b3dc3b82e66
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Apr 15 16:27:40 2008 +0100
emit a custom error when there is a file conflict
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index dfd44c7..0c5a55e 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -1005,8 +1005,11 @@ class PackageKitYumBackend(PackageKitBaseBackend):
'GPG')
self.error(ERROR_GPG_FAILURE,"GPG key not imported.")
except yum.Errors.YumBaseError, ye:
- retmsg = "Error in Transaction Processing;" + self._format_msgs(ye.value)
- self.error(ERROR_TRANSACTION_ERROR,retmsg)
+ message = self._format_msgs(ye.value)
+ if message.find ("conflicts with file") != -1:
+ self.error(ERROR_FILE_CONFLICTS,message)
+ else:
+ self.error(ERROR_TRANSACTION_ERROR,message)
def remove(self, allowdep, package):
'''
diff --git a/libpackagekit/pk-enum.c b/libpackagekit/pk-enum.c
index d661850..be3fc27 100644
--- a/libpackagekit/pk-enum.c
+++ b/libpackagekit/pk-enum.c
@@ -138,6 +138,7 @@ static PkEnumMatch enum_error[] = {
{PK_ERROR_ENUM_CANNOT_INSTALL_SOURCE_PACKAGE, "cannot-install-source-package"},
{PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR, "repo-configuration-error"},
{PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, "no-license-agreement"},
+ {PK_ERROR_ENUM_FILE_CONFLICTS, "file-conflicts"},
{0, NULL}
};
diff --git a/libpackagekit/pk-enum.h b/libpackagekit/pk-enum.h
index 068f5e8..f4a2020 100644
--- a/libpackagekit/pk-enum.h
+++ b/libpackagekit/pk-enum.h
@@ -227,6 +227,7 @@ typedef enum {
PK_ERROR_ENUM_CANNOT_INSTALL_SOURCE_PACKAGE,
PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR,
PK_ERROR_ENUM_NO_LICENSE_AGREEMENT,
+ PK_ERROR_ENUM_FILE_CONFLICTS,
PK_ERROR_ENUM_UNKNOWN
} PkErrorCodeEnum;
commit d72e947ffb8d5075d35e88e6b8a5f8c7b000b5fb
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Apr 15 15:49:39 2008 +0100
use BASENAME in GetPackages too
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index d966b48..dfd44c7 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -513,24 +513,33 @@ class PackageKitYumBackend(PackageKitBaseBackend):
self.allow_cancel(True)
self.yumbase.doConfigSetup(errorlevel=0,debuglevel=0)# Setup Yum Config
self.yumbase.conf.cache = 1 # Only look in cache.
+ package_list = [] #we can't do emitting as found if we are post-processing
+ fltlist = filters.split(';')
+
try:
- fltlist = filters.split(';')
- available = []
- count = 1
+ # Now show installed packages.
if FILTER_NOT_INSTALLED not in fltlist:
for pkg in self.yumbase.rpmdb:
if self._do_extra_filtering(pkg,fltlist):
- self._show_package(pkg, INFO_INSTALLED)
+ package_list.append((pkg,INFO_INSTALLED))
# Now show available packages.
if FILTER_INSTALLED not in fltlist:
for pkg in self.yumbase.pkgSack.returnNewestByNameArch():
if self._do_extra_filtering(pkg,fltlist):
- self._show_package(pkg, INFO_AVAILABLE)
+ package_list.append((pkg,INFO_AVAILABLE))
except yum.Errors.RepoError,e:
self._refresh_yum_cache()
self.error(ERROR_NO_CACHE,"Package cache was invalid and has been rebuilt.")
-
+
+ # basename filter if specified
+ if FILTER_BASENAME in fltlist:
+ for (pkg,status) in self._basename_filter(package_list):
+ self._show_package(pkg,status)
+ else:
+ for (pkg,status) in package_list:
+ self._show_package(pkg,status)
+
def search_file(self,filters,key):
'''
Implement the {backend}-search-file functionality
commit 1326d8bc6c8d39b0ba77ab522319139b33cd6837
Author: Till Maas <opensource at till.name>
Date: Tue Apr 15 15:32:42 2008 +0100
remove unneeded sourcing from the pm-utils script
diff --git a/data/95packagekit b/data/95packagekit
index 0c8cb0d..f6e72c3 100755
--- a/data/95packagekit
+++ b/data/95packagekit
@@ -7,8 +7,6 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-. /usr/lib/pm-utils/functions
-
case "$1" in
thaw|resume)
# get PackageKit to invalidate its caches and get new updates
commit b68de1019e0003c5cefcba8bebcb213393facf7d
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Apr 15 15:13:50 2008 +0100
don't use sqlite3_open_v2 as it's part of the new sqlite API, which we don't depend on
diff --git a/src/pk-transaction-db.c b/src/pk-transaction-db.c
index 228d180..7aa183f 100644
--- a/src/pk-transaction-db.c
+++ b/src/pk-transaction-db.c
@@ -496,7 +496,7 @@ pk_transaction_db_init (PkTransactionDb *tdb)
create_file = g_file_test (PK_TRANSACTION_DB_FILE, G_FILE_TEST_EXISTS);
pk_debug ("trying to open database '%s'", PK_TRANSACTION_DB_FILE);
- rc = sqlite3_open_v2 (PK_TRANSACTION_DB_FILE, &tdb->priv->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
+ rc = sqlite3_open (PK_TRANSACTION_DB_FILE, &tdb->priv->db);
if (rc) {
pk_error ("Can't open database: %s\n", sqlite3_errmsg (tdb->priv->db));
sqlite3_close (tdb->priv->db);
commit 3c4f0f925297c67dd76cbcbe0873d5ffec2f8ec5
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Apr 15 15:04:42 2008 +0100
yum: fix basename sorting so that we still show packages even if they do not produce a rpm as the same name as the srpm. fixes rh#442302
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 11d3c11..d966b48 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -305,11 +305,12 @@ class PackageKitYumBackend(PackageKitBaseBackend):
fltlist = filters.split(';')
installed_nevra = [] # yum returns packages as available even when installed
pkg_list = [] # only do the second iteration on not installed pkgs
+ package_list = [] #we can't do emitting as found if we are post-processing
for (pkg,values) in res:
if pkg.repo.id == 'installed':
if self._do_extra_filtering(pkg,fltlist):
- self._show_package(pkg, INFO_INSTALLED)
+ package_list.append((pkg,INFO_INSTALLED))
installed_nevra.append(self._get_nevra(pkg))
else:
pkg_list.append(pkg)
@@ -317,12 +318,20 @@ class PackageKitYumBackend(PackageKitBaseBackend):
nevra = self._get_nevra(pkg)
if nevra not in installed_nevra:
if self._do_extra_filtering(pkg,fltlist):
- self._show_package(pkg, INFO_AVAILABLE)
+ package_list.append((pkg,INFO_AVAILABLE))
except yum.Errors.RepoError,e:
self._refresh_yum_cache()
self.error(ERROR_NO_CACHE,"Package cache was invalid and has been rebuilt.")
+ # basename filter if specified
+ if FILTER_BASENAME in fltlist:
+ for (pkg,status) in self._basename_filter(package_list):
+ self._show_package(pkg,status)
+ else:
+ for (pkg,status) in package_list:
+ self._show_package(pkg,status)
+
def _do_extra_filtering(self,pkg,filterList):
''' do extra filtering (gui,devel etc) '''
for filter in filterList:
@@ -338,9 +347,6 @@ class PackageKitYumBackend(PackageKitBaseBackend):
elif filter in (FILTER_FREE, FILTER_NOT_FREE):
if not self._do_free_filtering(filter, pkg):
return False
- elif filter in (FILTER_BASENAME, FILTER_NOT_BASENAME):
- if not self._do_basename_filtering(filter, pkg):
- return False
return True
def _do_installed_filtering(self,flt,pkg):
@@ -395,33 +401,6 @@ class PackageKitYumBackend(PackageKitBaseBackend):
return isFree == wantFree
- def _do_basename_filtering(self,flt,pkg):
- if flt == FILTER_BASENAME:
- wantBase = True
- else:
- wantBase = False
-
- isBase = self._check_basename(pkg)
-
- return isBase == wantBase
-
- def _check_basename(self, pkg):
- '''
- If a package does not have a source rpm (If that ever
- happens), or it does have a source RPM, and the package's name
- is the same as the source RPM's name, then we assume it is the
- 'base' package.
- '''
- basename = pkg.name
-
- if pkg.sourcerpm:
- basename = rpmUtils.miscutils.splitFilename(pkg.sourcerpm)[0]
-
- if basename == pkg.name:
- return True
-
- return False
-
def search_name(self,filters,key):
'''
Implement the {backend}-search-name functionality
@@ -474,6 +453,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
self.yumbase.doConfigSetup(errorlevel=0,debuglevel=0)# Setup Yum Config
self.yumbase.conf.cache = 1 # Only look in cache.
self.status(STATUS_QUERY)
+ package_list = [] #we can't do emitting as found if we are post-processing
try:
pkgGroupDict = self._buildGroupDict()
@@ -491,7 +471,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
group = groupMap[cg] # use the pk group name, instead of yum 'category/group'
if group == key:
if self._do_extra_filtering(pkg, fltlist):
- self._show_package(pkg, INFO_INSTALLED)
+ package_list.append((pkg,INFO_INSTALLED))
installed_nevra.append(self._get_nevra(pkg))
if not FILTER_INSTALLED in fltlist:
@@ -506,7 +486,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
group = groupMap[cg]
if group == key:
if self._do_extra_filtering(pkg, fltlist):
- self._show_package(pkg, INFO_AVAILABLE)
+ package_list.append((pkg,INFO_AVAILABLE))
except yum.Errors.GroupsError,e:
self.error(ERROR_GROUP_NOT_FOUND,e)
@@ -514,6 +494,14 @@ class PackageKitYumBackend(PackageKitBaseBackend):
self._refresh_yum_cache()
self.error(ERROR_NO_CACHE,"Package cache was invalid and has been rebuilt.")
+ # basename filter if specified
+ if FILTER_BASENAME in fltlist:
+ for (pkg,status) in self._basename_filter(package_list):
+ self._show_package(pkg,status)
+ else:
+ for (pkg,status) in package_list:
+ self._show_package(pkg,status)
+
def get_packages(self,filters):
'''
Search for yum packages
@@ -1097,6 +1085,42 @@ class PackageKitYumBackend(PackageKitBaseBackend):
else:
return INFO_UNKNOWN
+ def _basename_filter(self, package_list):
+ '''
+ Filter the list so that the number of packages are reduced.
+ This is done by only displaying gtk2 rather than gtk2-devel, gtk2-debuginfo, etc.
+ This imlementation is done by comparing the SRPM name, and if not falling back
+ to the first entry.
+ We have to fall back else we don't emit packages where the SRPM does not produce a
+ RPM with the same name, for instance, mono produces mono-core, mono-data and mono-winforms.
+ @package_list: a (pkg,status) list of packages
+ A new list is returned that has been filtered
+ '''
+ base_list = []
+ output_list = []
+ base_list_already_got = []
+
+ #find out the srpm name and add to a new array of compound data
+ for (pkg,status) in package_list:
+ if pkg.sourcerpm:
+ base = rpmUtils.miscutils.splitFilename(pkg.sourcerpm)[0]
+ base_list.append ((pkg,status,base,pkg.version));
+ else:
+ base_list.append ((pkg,status,'nosrpm',pkg.version));
+
+ #find all the packages that match thier basename name (done seporately so we get the "best" match)
+ for (pkg,status,base,version) in base_list:
+ if base == pkg.name and (base,version) not in base_list_already_got:
+ output_list.append((pkg,status))
+ base_list_already_got.append ((base,version))
+
+ #for all the already added output lists, remove the same basename from base_list
+ for (pkg,status,base,version) in base_list:
+ if (base,version) not in base_list_already_got:
+ output_list.append((pkg,status))
+ base_list_already_got.append ((base,version))
+ return output_list
+
def get_updates(self, filters):
'''
Implement the {backend}-get-updates functionality
@@ -1108,6 +1132,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
self.status(STATUS_INFO)
fltlist = filters.split(';')
+ package_list = []
try:
ygl = self.yumbase.doPackageLists(pkgnarrow='updates')
@@ -1118,13 +1143,20 @@ class PackageKitYumBackend(PackageKitBaseBackend):
notice = md.get_notice((pkg.name, pkg.version, pkg.release))
if notice:
status = self._get_status(notice)
- self._show_package(pkg,status)
+ package_list.append((pkg,status))
else:
- self._show_package(pkg,INFO_NORMAL)
+ package_list.append((pkg,INFO_NORMAL))
except yum.Errors.RepoError,e:
self._refresh_yum_cache()
self.error(ERROR_NO_CACHE,"Package cache was invalid and has been rebuilt.")
-
+
+ # basename filter if specified
+ if FILTER_BASENAME in fltlist:
+ for (pkg,status) in self._basename_filter(package_list):
+ self._show_package(pkg,status)
+ else:
+ for (pkg,status) in package_list:
+ self._show_package(pkg,status)
def repo_enable(self, repoid, enable):
'''
commit 92da84c5f691e80b1df16b8bc02945e7ea214ec8
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Apr 15 10:55:53 2008 +0100
make sure we set the verbose state in pkcon
diff --git a/client/pk-console.c b/client/pk-console.c
index 72fb84b..4784614 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -1073,6 +1073,7 @@ main (int argc, char *argv[])
gchar *text;
ret = FALSE;
gboolean maybe_sync = TRUE;
+ PkFilterEnum filters = 0;
const GOptionEntry options[] = {
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
@@ -1121,6 +1122,8 @@ main (int argc, char *argv[])
options_help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
+ pk_debug_init (verbose);
+
if (program_version) {
g_print (VERSION "\n");
return 0;
@@ -1172,10 +1175,10 @@ main (int argc, char *argv[])
g_signal_connect (client_signature, "finished",
G_CALLBACK (pk_console_signature_finished_cb), NULL);
- PkFilterEnum filters = 0;
if (filter != NULL) {
filters = pk_filter_enums_from_text (filter);
}
+ pk_debug ("filter=%s, filters=%i", filter, filters);
mode = argv[1];
if (argc > 2) {
commit 7ace3ba641245a7944ec56c970b8f5ba3951e4a7
Author: Stefan Haas <shaas at suse.de>
Date: Tue Apr 15 10:31:13 2008 +0200
building buzilla & cve links like in dummy-backend
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index 13731f5..6debf91 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -743,6 +743,7 @@ backend_get_update_detail_thread (PkBackendThread *thread, gpointer data)
zypp::PoolItem item = zypp::ResPool::instance ().find (solvable);
gchar *bugzilla = new gchar ();
+ gchar *cve = new gchar ();
if (zypp::isKind<zypp::Patch>(solvable)) {
zypp::Patch::constPtr patch = zypp::asKind<zypp::Patch>(item);
@@ -752,10 +753,22 @@ backend_get_update_detail_thread (PkBackendThread *thread, gpointer data)
restart = PK_RESTART_ENUM_SESSION;
}
- zypp::Patch::ReferenceIterator it = patch->referencesBegin ();
-
- if ( it != patch->referencesEnd ())
- bugzilla = g_strdup(it.href ().c_str ());
+ // Building links like "http://www.distro-update.org/page?moo;Bugfix release for kernel;http://www.test.de/bgz;test domain"
+ for (zypp::Patch::ReferenceIterator it = patch->referencesBegin (); it != patch->referencesEnd (); it ++) {
+ if (it.type () == "bugzilla") {
+ if (strlen (bugzilla) == 0) {
+ bugzilla = g_strconcat (it.href ().c_str (), ";", it.title ().c_str (), (gchar *)NULL);
+ }else{
+ bugzilla = g_strconcat (bugzilla, ";", it.href ().c_str (), ";", it.title ().c_str (), (gchar *)NULL);
+ }
+ }else{
+ if (strlen (cve) == 0) {
+ cve = g_strconcat (it.href ().c_str (), ";", it.title ().c_str (), (gchar *)NULL);
+ }else{
+ cve = g_strconcat (cve, it.href ().c_str (), ";", it.title ().c_str (), ";", (gchar *)NULL);
+ }
+ }
+ }
zypp::sat::SolvableSet content = patch->contents ();
@@ -771,11 +784,12 @@ backend_get_update_detail_thread (PkBackendThread *thread, gpointer data)
obsoletes, // CURRENTLY CAUSES SEGFAULT obsoletes,
"", // CURRENTLY CAUSES SEGFAULT solvable.vendor ().c_str (),
bugzilla, // bugzilla
- "", // cve
+ cve, // cve
restart,
solvable.lookupStrAttribute (zypp::sat::SolvAttr::description).c_str ());
g_free (bugzilla);
+ g_free (cve);
g_free (obsoletes);
g_free (updates);
pk_package_id_free (pi);
commit 1f8347134f7e7525eb76fe597993f21dd41830fa
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Apr 15 00:02:05 2008 +0100
don't allow org.freedesktop.packagekit.install-file to be retained
diff --git a/policy/org.freedesktop.packagekit.policy.in b/policy/org.freedesktop.packagekit.policy.in
index e5d493e..0de231a 100644
--- a/policy/org.freedesktop.packagekit.policy.in
+++ b/policy/org.freedesktop.packagekit.policy.in
@@ -31,7 +31,7 @@
<vendor_url>http://www.packagekit.org/pk-reference.html#methods-install-file</vendor_url>
<defaults>
<allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep_always</allow_active>
+ <allow_active>auth_admin</allow_active>
</defaults>
</action>
commit 9c724e90e537a8c488c78dfc7b9ecc03e58323a8
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Apr 14 23:10:32 2008 +0100
Disable ptrace() and core dumping for applications which use libpackagekit so that local trojans cannot silently abuse privileges
diff --git a/libpackagekit/pk-client.c b/libpackagekit/pk-client.c
index fd6b08e..c933884 100644
--- a/libpackagekit/pk-client.c
+++ b/libpackagekit/pk-client.c
@@ -33,6 +33,7 @@
#include <string.h>
#include <sys/types.h>
+#include <sys/prctl.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif /* HAVE_UNISTD_H */
@@ -3556,6 +3557,20 @@ pk_client_new (void)
return PK_CLIENT (client);
}
+/**
+ * init:
+ *
+ * Library constructor: Disable ptrace() and core dumping for applications
+ * which use this library, so that local trojans cannot silently abuse PackageKit
+ * privileges.
+ */
+__attribute__ ((constructor))
+void init()
+{
+ /* this is a bandaid */
+ prctl (PR_SET_DUMPABLE, 0);
+}
+
/***************************************************************************
*** MAKE CHECK TESTS ***
***************************************************************************/
commit 8d01d474816bbe0b7e926ba129ade198fb0b6e14
Author: Marcin Banasiak <megabajt at pld-linux.org>
Date: Mon Apr 14 23:09:05 2008 +0200
poldek: warn user about problems with connecting to the server
diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c
index e81418e..d5565be 100644
--- a/backends/poldek/pk-backend-poldek.c
+++ b/backends/poldek/pk-backend-poldek.c
@@ -480,6 +480,8 @@ setup_vf_progress (struct vf_progress *vf_progress, TsData *td)
vf_progress->free = NULL;
vfile_configure (VFILE_CONF_VERBOSE, &verbose);
+ vfile_configure (VFILE_CONF_STUBBORN_NRETRIES, 5);
+
poldek_configure (ctx, POLDEK_CONF_VFILEPROGRESS, vf_progress);
}
@@ -1089,7 +1091,12 @@ poldek_backend_log (void *data, int pri, char *message)
PkBackend *backend;
backend = pk_backend_thread_get_backend (thread);
- if (msg) {
+
+ /* catch vfff messages */
+ if (g_str_has_prefix (message, "vfff: ")) {
+ // 'vfff: unable to connect to ftp.pld-linux.org:21: Connection refused'
+ pk_backend_message (backend, PK_MESSAGE_ENUM_WARNING, "%s", message);
+ } else if (msg) {
if (strcmp (msg+(2*sizeof(char)), "equal version installed, skipped\n") == 0)
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ALREADY_INSTALLED, "Package already installed");
commit c0411c172aaf14fa0e656596deb12603c5d31afb
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Apr 14 20:54:21 2008 +0100
don't allow org.freedesktop.packagekit.install-signature to be retained
diff --git a/policy/org.freedesktop.packagekit.policy.in b/policy/org.freedesktop.packagekit.policy.in
index b028752..e5d493e 100644
--- a/policy/org.freedesktop.packagekit.policy.in
+++ b/policy/org.freedesktop.packagekit.policy.in
@@ -42,7 +42,7 @@
<vendor_url>http://www.packagekit.org/pk-reference.html#methods-install-signature</vendor_url>
<defaults>
<allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep_always</allow_active>
+ <allow_active>auth_admin</allow_active>
</defaults>
</action>
commit 6da79f331a2e423e3af19917e62bf5525221984c
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Apr 14 20:11:26 2008 +0100
update a screenshot
diff --git a/docs/html/img/pk-added-deps.png b/docs/html/img/pk-added-deps.png
index 29e5c81..8cc922e 100644
Binary files a/docs/html/img/pk-added-deps.png and b/docs/html/img/pk-added-deps.png differ
More information about the PackageKit-commit
mailing list