[PackageKit-commit] packagekit: Branch 'master' - 15 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Fri May 2 15:38:15 PDT 2008
NEWS | 4 +-
TODO | 15 ---------
backends/alpm/pk-backend-alpm.c | 8 ++---
backends/apt/helpers/Makefile.am | 2 -
backends/apt/helpers/aptBackend.py | 4 +-
backends/apt/helpers/get-description.py | 18 -----------
backends/apt/helpers/get-details.py | 18 +++++++++++
backends/apt/pk-apt-search-plain.c | 6 +--
backends/apt/pk-apt-search-sqlite.cpp | 6 +--
backends/apt/pk-apt-search.h | 2 -
backends/apt/pk-backend-apt.c | 2 -
backends/apt/pk-sqlite-pkg-cache.cpp | 12 +++----
backends/apt/pk-sqlite-pkg-cache.h | 2 -
backends/apt2/aptDBUSBackend.py | 8 ++---
backends/apt2/pk-backend-apt2.c | 8 ++---
backends/apt2/test.py | 6 +--
backends/box/pk-backend-box.c | 12 +++----
backends/conary/helpers/Makefile.am | 2 -
backends/conary/helpers/conaryBackend.py | 6 +--
backends/conary/helpers/get-description.py | 18 -----------
backends/conary/helpers/get-details.py | 18 +++++++++++
backends/conary/pk-backend-conary.c | 8 ++---
backends/dummy/pk-backend-dummy.c | 8 ++---
backends/opkg/pk-backend-opkg.c | 10 +++++-
backends/pisi/helpers/Makefile.am | 2 -
backends/pisi/helpers/get-description.py | 19 -----------
backends/pisi/helpers/get-details.py | 19 +++++++++++
backends/pisi/helpers/pisiBackend.py | 4 +-
backends/pisi/pk-backend-pisi.c | 8 ++---
backends/poldek/pk-backend-poldek.c | 14 ++++----
backends/smart/helpers/Makefile.am | 2 -
backends/smart/helpers/get-description.py | 20 ------------
backends/smart/helpers/get-details.py | 20 ++++++++++++
backends/smart/helpers/smartBackend.py | 8 ++---
backends/smart/pk-backend-smart.c | 8 ++---
backends/test-backend.sh | 4 +-
backends/test/pk-backend-test-dbus.c | 2 -
backends/test/pk-backend-test-fail.c | 6 +--
backends/test/pk-backend-test-nop.c | 2 -
backends/test/pk-backend-test-spawn.c | 2 -
backends/test/pk-backend-test-succeed.c | 8 ++---
backends/test/pk-backend-test-thread.c | 2 -
backends/yum/helpers/Makefile.am | 2 -
backends/yum/helpers/get-description.py | 19 -----------
backends/yum/helpers/get-details.py | 19 +++++++++++
backends/yum/helpers/yumBackend.py | 25 ++++++++-------
backends/yum/pk-backend-yum.c | 8 ++---
backends/yum2/helpers/testyum2.py | 6 +--
backends/yum2/helpers/yumDBUSBackend.py | 24 +++++++--------
backends/yum2/pk-backend-yum2.c | 8 ++---
backends/zypp/pk-backend-zypp.cpp | 14 ++++----
client/pk-console.c | 26 ++++++++--------
contrib/pk-completion.bash | 2 -
docs/html/img/kpk-information.png |binary
docs/html/img/kpk-search.png |binary
docs/html/img/pk-opensuse-updater.png |binary
docs/html/pk-faq.html | 2 -
docs/html/pk-help.html | 6 +--
docs/html/pk-screenshots.html | 18 ++++++++++-
docs/spec/pk-backend-spawn.xml | 8 ++---
docs/spec/pk-methods.xml | 8 ++---
docs/spec/pk-signals.xml | 12 +------
libpackagekit/pk-client.c | 46 ++++++++++++++---------------
libpackagekit/pk-client.h | 4 +-
libpackagekit/pk-enum.c | 3 +
libpackagekit/pk-enum.h | 3 +
libpackagekit/pk-extra.c | 3 -
python/packagekit/backend.py | 10 +++---
python/packagekit/daemonBackend.py | 14 ++++----
python/packagekit/frontend.py | 22 +++++--------
python/pk-frontend-test.py | 4 +-
src/pk-backend-dbus.c | 24 +++++++--------
src/pk-backend-dbus.h | 2 -
src/pk-backend-spawn.c | 4 +-
src/pk-backend.c | 23 ++++++--------
src/pk-backend.h | 8 ++---
src/pk-interface-transaction.xml | 4 +-
src/pk-transaction.c | 40 ++++++++++++-------------
src/pk-transaction.h | 2 -
79 files changed, 386 insertions(+), 390 deletions(-)
New commits:
commit dc7b744135fe7bb09b50c053180287402fc727b9
Merge: ce0e033... 268066a...
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 22:13:28 2008 +0100
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit 268066a5e171cf8b68568a4e097df5e07d158669
Merge: ea2839d... 3972169...
Author: Robin Norwood <rnorwood at redhat.com>
Date: Fri May 2 16:26:11 2008 -0400
Merge branch 'master' of git+ssh://rnorwood@git.packagekit.org/srv/git/PackageKit
commit ea2839d9f94c8a048f7ec65e3fc1d784d4661c1b
Author: Robin Norwood <rnorwood at redhat.com>
Date: Fri May 2 16:25:44 2008 -0400
Fix duplicates in search lists.
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 728b43b..d48849a 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -316,7 +316,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
'''
res = self.yumbase.searchGenerator(searchlist,[key])
fltlist = filters.split(';')
- installed_nevra = [] # yum returns packages as available even when installed
+ seen_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
@@ -324,14 +324,15 @@ class PackageKitYumBackend(PackageKitBaseBackend):
if pkg.repo.id == 'installed':
if self._do_extra_filtering(pkg,fltlist):
package_list.append((pkg,INFO_INSTALLED))
- installed_nevra.append(self._get_nevra(pkg))
+ seen_nevra.append(self._get_nevra(pkg))
else:
pkg_list.append(pkg)
for pkg in pkg_list:
nevra = self._get_nevra(pkg)
- if nevra not in installed_nevra:
+ if nevra not in seen_nevra:
if self._do_extra_filtering(pkg,fltlist):
package_list.append((pkg,INFO_AVAILABLE))
+ seen_nevra.append(self._get_nevra(pkg))
# basename filter if specified
if FILTER_BASENAME in fltlist:
commit ce0e0336040c33f3c180eab77ff7009717da247f
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 18:45:28 2008 +0100
fix the year
diff --git a/docs/html/pk-help.html b/docs/html/pk-help.html
index a66b6a6..47ec7d9 100644
--- a/docs/html/pk-help.html
+++ b/docs/html/pk-help.html
@@ -69,7 +69,7 @@ If you want to work on a feature and bring it forward, please just jump on the m
as for instructions!
</p>
<p>
-<b>0.2.0</b> - To be released May 2009
+<b>0.2.0</b> - To be released May 2008
</p>
<ul>
<li>New Transaction DBUS interface <i>(100%)</i></li>
@@ -77,7 +77,7 @@ as for instructions!
<li>EULA and GPG signature support <i>(95%)</i></li>
</ul>
<p>
-<b>0.2.1</b> - To be released June 2009
+<b>0.2.1</b> - To be released June 2008
</p>
<ul>
<li>Multiple package installs in the API <i>(0%)</i></li>
@@ -85,7 +85,7 @@ as for instructions!
<li>NetworkManager integration so we can detect GPRS (and modem) connections. <i>(10%)</i></li>
</ul>
<p>
-<b>0.2.2</b> - To be released July 2009
+<b>0.2.2</b> - To be released July 2008
</p>
<ul>
<li>Multiple package installs from gpk-application <i>(0%)</i></li>
commit 5271df4c30b277783bebb6857929139fe3cd6d0d
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 18:45:03 2008 +0100
add some more screenshots
diff --git a/docs/html/img/kpk-information.png b/docs/html/img/kpk-information.png
new file mode 100644
index 0000000..36f4aaf
Binary files /dev/null and b/docs/html/img/kpk-information.png differ
diff --git a/docs/html/img/kpk-search.png b/docs/html/img/kpk-search.png
new file mode 100644
index 0000000..6642e49
Binary files /dev/null and b/docs/html/img/kpk-search.png differ
diff --git a/docs/html/img/pk-opensuse-updater.png b/docs/html/img/pk-opensuse-updater.png
new file mode 100644
index 0000000..cce2cb0
Binary files /dev/null and b/docs/html/img/pk-opensuse-updater.png differ
diff --git a/docs/html/pk-screenshots.html b/docs/html/pk-screenshots.html
index 642e7dd..902c87a 100644
--- a/docs/html/pk-screenshots.html
+++ b/docs/html/pk-screenshots.html
@@ -17,8 +17,13 @@
<p>Back to the <a href="index.html">main page</a></p>
-<h1>Screenshots</h1>
+<h2>Table Of Contents</h2>
+<ul>
+<li><a href="#gnome">GNOME Screenshots</a></li>
+<li><a href="#kde">KDE Screenshots</a></li>
+</ul>
+<h1><a name="gnome">GNOME Screenshots</a></h1>
<center><img src="img/gpk-application-search.png" alt="[img]"/></center>
<p class="caption">Add/Remove Software search</p>
@@ -77,6 +82,17 @@
<center><img src="img/gpk-auto-update.png" alt="[img]"/></center>
<p class="caption">Auto update install dialog</p>
+<h1><a name="kde">KDE Screenshots</a></h1>
+
+<center><img src="img/kpk-search.png" alt="[img]"/></center>
+<p class="caption">KPackageKit Searching</p>
+
+<center><img src="img/kpk-information.png" alt="[img]"/></center>
+<p class="caption">KPackageKit Package Information</p>
+
+<center><img src="img/pk-opensuse-updater.png" alt="[img]"/></center>
+<p class="caption">OpenSuse Updater</p>
+
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
commit 397216904efbe06b246189ff15ff3b15d9ec811b
Merge: a9c08dd... cee6299...
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 18:21:04 2008 +0100
Merge branch 'rename'
commit a9c08ddd32e7600a96ff8d5fc3b11850eb580f92
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 18:15:44 2008 +0100
remove some junk debugging that crept in late at night
diff --git a/libpackagekit/pk-extra.c b/libpackagekit/pk-extra.c
index da50127..7f01a4c 100644
--- a/libpackagekit/pk-extra.c
+++ b/libpackagekit/pk-extra.c
@@ -102,13 +102,10 @@ pk_extra_populate_package_cache_callback (void *data, gint argc, gchar **argv, g
value = argv[i];
/* save the package name, and use it is the key */
if (pk_strequal (col, "package") && value != NULL) {
-pk_warning ("package=%s", argv[i]);
package = g_strdup (argv[i]);
} else if (pk_strequal (col, "icon") && value != NULL) {
-pk_warning ("icon_name=%s", argv[i]);
icon_name = g_strdup (argv[i]);
} else if (pk_strequal (col, "exec") && value != NULL) {
-pk_warning ("exec=%s", argv[i]);
exec = g_strdup (argv[i]);
}
}
commit cee62998eb81c845bcb53e2d2ae9cb69bed13cde
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 18:05:53 2008 +0100
rename the Description signal to Details
diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
index df4b068..578cf6c 100644
--- a/backends/alpm/pk-backend-alpm.c
+++ b/backends/alpm/pk-backend-alpm.c
@@ -990,7 +990,7 @@ backend_get_details (PkBackend *backend, const gchar *package_id)
}
}
- pk_backend_description (backend, package_id, licenses, PK_GROUP_ENUM_OTHER, alpm_pkg_get_desc (pkg), alpm_pkg_get_url(pkg), alpm_pkg_get_size (pkg));
+ pk_backend_details (backend, package_id, licenses, PK_GROUP_ENUM_OTHER, alpm_pkg_get_desc (pkg), alpm_pkg_get_url(pkg), alpm_pkg_get_size (pkg));
pk_backend_finished (backend);
}
diff --git a/backends/apt/pk-sqlite-pkg-cache.cpp b/backends/apt/pk-sqlite-pkg-cache.cpp
index acc08cb..770fcdf 100644
--- a/backends/apt/pk-sqlite-pkg-cache.cpp
+++ b/backends/apt/pk-sqlite-pkg-cache.cpp
@@ -188,7 +188,7 @@ sqlite_get_details_thread (PkBackend *backend)
if (res!=SQLITE_OK)
pk_error("sqlite error during select prepare: %s", sqlite3_errmsg(db));
res = sqlite3_step(package);
- pk_backend_description(backend,pi->name, "unknown", PK_GROUP_ENUM_OTHER,(const gchar*)sqlite3_column_text(package,0),"",0);
+ pk_backend_details(backend,pi->name, "unknown", PK_GROUP_ENUM_OTHER,(const gchar*)sqlite3_column_text(package,0),"",0);
res = sqlite3_step(package);
if (res==SQLITE_ROW)
pk_error("multiple matches for that package!");
diff --git a/backends/apt2/aptDBUSBackend.py b/backends/apt2/aptDBUSBackend.py
index 1e6958d..6c5454b 100755
--- a/backends/apt2/aptDBUSBackend.py
+++ b/backends/apt2/aptDBUSBackend.py
@@ -302,7 +302,7 @@ class PackageKitAptBackend(PackageKitBaseBackend):
'''
Implement the {backend}-get-details functionality
'''
- pklog.info("Get description of %s" % pkg_id)
+ pklog.info("Get details of %s" % pkg_id)
self.StatusChanged(STATUS_INFO)
self.NoPercentageUpdates()
self.AllowCancel(False)
@@ -331,7 +331,7 @@ class PackageKitAptBackend(PackageKitBaseBackend):
p = re.compile(r'\s\s+', re.MULTILINE)
desc = p.sub('\n', desc)
#FIXME: group and licence information missing
- self.Description(pkg_id, 'unknown', 'unknown', desc,
+ self.Details(pkg_id, 'unknown', 'unknown', desc,
pkg.homepage, pkg.packageSize)
self.Finished(EXIT_SUCCESS)
diff --git a/backends/box/pk-backend-box.c b/backends/box/pk-backend-box.c
index ebfb775..e63f5f3 100644
--- a/backends/box/pk-backend-box.c
+++ b/backends/box/pk-backend-box.c
@@ -300,7 +300,7 @@ backend_get_details_thread (PkBackend *backend)
}
ps = (PackageSearch*) list->data;
- pk_backend_description (backend, package_id, "unknown", PK_GROUP_ENUM_OTHER, ps->description, "", 0);
+ pk_backend_details (backend, package_id, "unknown", PK_GROUP_ENUM_OTHER, ps->description, "", 0);
pk_package_id_free (pi);
box_db_repos_package_list_free (list);
diff --git a/backends/conary/helpers/conaryBackend.py b/backends/conary/helpers/conaryBackend.py
index af2bd07..a612ebf 100644
--- a/backends/conary/helpers/conaryBackend.py
+++ b/backends/conary/helpers/conaryBackend.py
@@ -474,7 +474,7 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
notice = self._get_metadata(id, 'notice') or " "
urls = {'jira':[], 'cve' : [], 'vendor': []}
if notice:
- # Update Description
+ # Update Details
desc = notice['description']
# Update References (Jira,CVE ...)
refs = notice['references']
@@ -541,7 +541,7 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
categories = self._get_metadata(id, 'categories') or "unknown"
# Package size goes here, but I don't know how to find that for conary packages.
- self.description(shortDesc, id, categories, longDesc, url, 0)
+ self.details(shortDesc, id, categories, longDesc, url, 0)
else:
self.error(ERROR_PACKAGE_NOT_FOUND,'Package was not found')
diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index ab96961..016bd46 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -141,7 +141,7 @@ backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
- pk_backend_description (backend, "gnome-power-manager;2.6.19;i386;fedora", "GPL2", PK_GROUP_ENUM_PROGRAMMING,
+ pk_backend_details (backend, "gnome-power-manager;2.6.19;i386;fedora", "GPL2", PK_GROUP_ENUM_PROGRAMMING,
"Scribus is an desktop open source page layöut program with "
"the aim of producing commercial grade output in PDF and "
"Postscript, primarily, though not exclusively for Linux.\n"
diff --git a/backends/pisi/helpers/pisiBackend.py b/backends/pisi/helpers/pisiBackend.py
index 46c2751..f64478f 100644
--- a/backends/pisi/helpers/pisiBackend.py
+++ b/backends/pisi/helpers/pisiBackend.py
@@ -176,7 +176,7 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
else:
group = GROUP_UNKNOWN
- self.description("%s-%s" % (pkg.name, self.__get_package_version(pkg)),
+ self.details("%s-%s" % (pkg.name, self.__get_package_version(pkg)),
pkg.license,
group,
pkg.description,
diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c
index f4fb8fb..74723f1 100644
--- a/backends/poldek/pk-backend-poldek.c
+++ b/backends/poldek/pk-backend-poldek.c
@@ -1404,7 +1404,7 @@ backend_get_details_thread (PkBackend *backend)
pkgu = pkg_uinf (pkg);
if (pkgu) {
- pk_backend_description (backend,
+ pk_backend_details (backend,
package_id,
pkguinf_get (pkgu, PKGUINF_LICENSE),
PK_GROUP_ENUM_OTHER,
@@ -1413,7 +1413,7 @@ backend_get_details_thread (PkBackend *backend)
pkg->size);
pkguinf_free (pkgu);
} else {
- pk_backend_description (backend,
+ pk_backend_details (backend,
package_id,
"",
PK_GROUP_ENUM_OTHER,
diff --git a/backends/smart/helpers/smartBackend.py b/backends/smart/helpers/smartBackend.py
index 3680407..5eca099 100644
--- a/backends/smart/helpers/smartBackend.py
+++ b/backends/smart/helpers/smartBackend.py
@@ -215,7 +215,7 @@ class PackageKitSmartBackend(PackageKitBaseBackend):
if not pkgsize:
pkgsize = "unknown"
- self.description(packageid, "unknown", "unknown", description, url,
+ self.details(packageid, "unknown", "unknown", description, url,
pkgsize)
@needs_cache
diff --git a/backends/test-backend.sh b/backends/test-backend.sh
index c44057c..9d42272 100755
--- a/backends/test-backend.sh
+++ b/backends/test-backend.sh
@@ -9,7 +9,7 @@ echo "get deps $package_id"
./$backend/helpers/get-deps.py $package_id
echo "exitcode=$?"
-echo "get description $package_id"
+echo "get details $package_id"
./$backend/helpers/get-details.py $package_id
echo "exitcode=$?"
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 5f09a78..20094d9 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -243,9 +243,9 @@ class PackageKitYumBackend(PackageKitBaseBackend):
if lock:
self.doLock()
- def description(self,id,license,group,desc,url,bytes):
+ def details(self,id,license,group,desc,url,bytes):
'''
- Send 'description' signal
+ Send 'details' signal
@param id: The package ID name, e.g. openoffice-clipart;2.6.22;ppc64;fedora
@param license: The license of the package
@param group: The enumerated group
@@ -255,7 +255,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
convert the description to UTF before sending
'''
desc = self._to_unicode(desc)
- PackageKitBaseBackend.description(self,id,license,group,desc,url,bytes)
+ PackageKitBaseBackend.details(self,id,license,group,desc,url,bytes)
def package(self,id,status,summary):
'''
@@ -1124,7 +1124,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
def get_details(self,package):
'''
- Print a detailed description for a given package
+ Print a detailed details for a given package
'''
self._check_init()
self.allow_cancel(True)
@@ -1133,18 +1133,18 @@ class PackageKitYumBackend(PackageKitBaseBackend):
pkg,inst = self._findPackage(package)
if pkg:
- self._show_description(pkg)
+ self._show_details(pkg)
else:
self.error(ERROR_PACKAGE_NOT_FOUND,'Package %s was not found' % package)
- def _show_description(self,pkg):
+ def _show_details(self,pkg):
pkgver = self._get_package_ver(pkg)
id = self.get_package_id(pkg.name,pkgver,pkg.arch,pkg.repo)
desc = pkg.description
desc = desc.replace('\n\n',';')
desc = desc.replace('\n',' ')
- self.description(id,pkg.license,"unknown",desc,pkg.url,
+ self.details(id,pkg.license,"unknown",desc,pkg.url,
pkg.size)
def get_files(self,package):
@@ -1371,7 +1371,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
notice = md.get_notice((pkg.name,pkg.version,pkg.release))
urls = {'bugzilla':[],'cve' : [],'vendor': []}
if notice:
- # Update Description
+ # Update Details
desc = notice['description']
# Update References (Bugzilla,CVE ...)
refs = notice['references']
diff --git a/backends/yum2/helpers/yumDBUSBackend.py b/backends/yum2/helpers/yumDBUSBackend.py
index d285f4f..0a5acad 100755
--- a/backends/yum2/helpers/yumDBUSBackend.py
+++ b/backends/yum2/helpers/yumDBUSBackend.py
@@ -264,7 +264,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
# Signals ( backend -> engine -> client )
#
- #FIXME: _show_description and _show_package wrap Description and
+ #FIXME: _show_details and _show_package wrap Details and
# Package so that the encoding can be fixed. This is ugly.
# we could probably use a decorator to do it instead.
@@ -280,9 +280,9 @@ class PackageKitYumBackend(PackageKitBaseBackend):
summary = self._to_unicode(pkg.summary)
self.Package(status,id,summary)
- def _show_description(self,id,license,group,desc,url,bytes):
+ def _show_details(self,id,license,group,desc,url,bytes):
'''
- Send 'description' signal
+ Send 'details' signal
@param id: The package ID name, e.g. openoffice-clipart;2.6.22;ppc64;fedora
@param license: The license of the package
@param group: The enumerated group
@@ -292,7 +292,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
convert the description to UTF before sending
'''
desc = self._to_unicode(desc)
- self.Description(id,license,group,desc,url,bytes)
+ self.Details(id,license,group,desc,url,bytes)
def _show_update_detail(self,pkg,update,obsolete,vendor_url,bz_url,cve_url,reboot,desc):
'''
@@ -975,7 +975,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
@async
def doGetDetails(self, package):
'''
- Print a detailed description for a given package
+ Print a detailed details for a given package
'''
self._check_init()
self._lock_yum()
@@ -990,7 +990,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
return
if pkg:
- self._show_package_description(pkg)
+ self._show_package_details(pkg)
else:
self._unlock_yum()
self.ErrorCode(ERROR_PACKAGE_NOT_FOUND,'Package was not found')
@@ -1104,7 +1104,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
if showPkg:
self._show_package(pkg, INFO_INSTALLED)
if showDesc:
- self._show_package_description(pkg)
+ self._show_package_details(pkg)
# Now show available packages.
@@ -1118,7 +1118,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
if showPkg:
self._show_package(pkg, INFO_AVAILABLE)
if showDesc:
- self._show_package_description(pkg)
+ self._show_package_details(pkg)
except yum.Errors.RepoError,e:
self.Message(MESSAGE_NOTICE, "The package cache is invalid and is being rebuilt.")
self._refresh_yum_cache()
@@ -1535,7 +1535,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
pkgGroups[pkg] = "%s;%s" % (cat.categoryid,group.groupid)
return pkgGroups
- def _show_package_description(self,pkg):
+ def _show_package_details(self,pkg):
pkgver = self._get_package_ver(pkg)
id = self._get_package_id(pkg.name, pkgver, pkg.arch, pkg.repo)
desc = pkg.description
@@ -1543,7 +1543,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
desc = desc.replace('\n',' ')
desc = desc.replace('__PARAGRAPH_SEPARATOR__','\n')
- self._show_description(id, pkg.license, "unknown", desc, pkg.url,
+ self._show_details(id, pkg.license, "unknown", desc, pkg.url,
pkg.size)
def _getEVR(self,idver):
@@ -1807,7 +1807,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
urls = {'bugzilla': [], 'cve': [], 'vendor': []}
notice = self.updateMetadata.get_notice((pkg.name, pkg.version, pkg.release))
if notice:
- # Update Description
+ # Update Details
desc = notice['description']
# Update References (Bugzilla,CVE ...)
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index d30b3b2..7c28f4e 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -497,7 +497,7 @@ backend_get_details_thread (PkBackend *backend)
if (package.isSystem ()){
zypp::target::rpm::RpmHeader::constPtr rpmHeader = zypp_get_rpmHeader (package.name (), package.edition ());
- pk_backend_description (backend,
+ pk_backend_details (backend,
package_id, // package_id
rpmHeader->tag_license ().c_str (), // const gchar *license
group, // PkGroupEnum group
@@ -506,7 +506,7 @@ backend_get_details_thread (PkBackend *backend)
(gulong)rpmHeader->tag_archivesize ()); // gulong size
} else {
- pk_backend_description (backend,
+ pk_backend_details (backend,
package_id,
package.lookupStrAttribute (zypp::sat::SolvAttr::license).c_str (), //pkg->license ().c_str (),
group,
diff --git a/client/pk-console.c b/client/pk-console.c
index 532f5fb..62ad8dd 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -769,7 +769,7 @@ pk_console_get_details (PkClient *client, const gchar *package, GError **error)
gchar *package_id;
package_id = pk_console_perhaps_resolve (client, PK_FILTER_ENUM_NONE, package, error);
if (package_id == NULL) {
- g_print ("%s\n", _("Could not find a description for this package"));
+ g_print ("%s\n", _("Could not find details for this package"));
return FALSE;
}
ret = pk_client_get_details (client, package_id, error);
@@ -855,10 +855,10 @@ pk_console_error_code_cb (PkClient *client, PkErrorCodeEnum error_code, const gc
}
/**
- * pk_console_description_cb:
+ * pk_console_details_cb:
**/
static void
-pk_console_description_cb (PkClient *client, const gchar *package_id,
+pk_console_details_cb (PkClient *client, const gchar *package_id,
const gchar *license, PkGroupEnum group,
const gchar *description, const gchar *url,
gulong size, gpointer data)
@@ -1231,8 +1231,8 @@ main (int argc, char *argv[])
G_CALLBACK (pk_console_package_cb), NULL);
g_signal_connect (client, "transaction",
G_CALLBACK (pk_console_transaction_cb), NULL);
- g_signal_connect (client, "description",
- G_CALLBACK (pk_console_description_cb), NULL);
+ g_signal_connect (client, "details",
+ G_CALLBACK (pk_console_details_cb), NULL);
g_signal_connect (client, "files",
G_CALLBACK (pk_console_files_cb), NULL);
g_signal_connect (client, "repo-signature-required",
@@ -1446,7 +1446,7 @@ main (int argc, char *argv[])
} else if (strcmp (mode, "get-details") == 0) {
if (value == NULL) {
- g_print (_("You need to specify a package to find the description for"));
+ g_print (_("You need to specify a package to find the details for"));
goto out;
}
ret = pk_console_get_details (client, value, &error);
diff --git a/docs/spec/pk-backend-spawn.xml b/docs/spec/pk-backend-spawn.xml
index 0d77dd8..e2dd0b7 100644
--- a/docs/spec/pk-backend-spawn.xml
+++ b/docs/spec/pk-backend-spawn.xml
@@ -115,7 +115,7 @@
<entry><literal>get-update-detail.*</literal></entry>
</row>
<row>
- <entry>Get Description</entry>
+ <entry>Get Details</entry>
<entry><literal>get-details.*</literal></entry>
</row>
<row>
@@ -205,8 +205,8 @@
<entry><literal>package_id[tab]status[tab]summary</literal></entry>
</row>
<row>
- <entry>Description</entry>
- <entry><literal>description[tab]package_id[tab]group[tab]detail[tab]url[tab]size_in_bytes</literal></entry>
+ <entry>Details</entry>
+ <entry><literal>details[tab]package_id[tab]group[tab]detail[tab]url[tab]size_in_bytes</literal></entry>
</row>
<row>
<entry>Files</entry>
diff --git a/docs/spec/pk-methods.xml b/docs/spec/pk-methods.xml
index 23e6fb2..21761c5 100644
--- a/docs/spec/pk-methods.xml
+++ b/docs/spec/pk-methods.xml
@@ -654,9 +654,9 @@
</sect1>
<sect1 id="methods-get-details">
- <title>Get Description</title>
+ <title>Get Details</title>
<para>
- GetDetails should return the description of that
+ GetDetails should return all the details about a specific
<literal>package_id</literal>.
</para>
<para>
@@ -683,7 +683,7 @@
<literal>Progress</literal>,
<literal>Status</literal> and
<literal>Error</literal> and
- <literal>Description</literal>.
+ <literal>Details</literal>.
</para>
</sect1>
diff --git a/docs/spec/pk-signals.xml b/docs/spec/pk-signals.xml
index 869ba19..a79e647 100644
--- a/docs/spec/pk-signals.xml
+++ b/docs/spec/pk-signals.xml
@@ -291,8 +291,8 @@
</sect1>
- <sect1 id="signals-description">
- <title>Description</title>
+ <sect1 id="signals-details">
+ <title>Details</title>
<informaltable>
<tgroup cols="2">
<thead>
@@ -338,14 +338,6 @@
files installed on the system.
</entry>
</row>
- <row>
- <entry><literal>file_list</literal></entry>
- <entry>
- A list of all files and directories created by the package
- at install time.
- The list is separated by the <literal>;</literal> character.
- </entry>
- </row>
</tbody>
</tgroup>
</informaltable>
diff --git a/libpackagekit/pk-client.c b/libpackagekit/pk-client.c
index 5aec425..5dcd696 100644
--- a/libpackagekit/pk-client.c
+++ b/libpackagekit/pk-client.c
@@ -96,7 +96,7 @@ struct _PkClientPrivate
};
typedef enum {
- PK_CLIENT_DESCRIPTION,
+ PK_CLIENT_DETAILS,
PK_CLIENT_ERROR_CODE,
PK_CLIENT_FILES,
PK_CLIENT_FINISHED,
@@ -539,10 +539,10 @@ pk_client_update_detail_cb (DBusGProxy *proxy,
}
/**
- * pk_client_description_cb:
+ * pk_client_details_cb:
*/
static void
-pk_client_description_cb (DBusGProxy *proxy,
+pk_client_details_cb (DBusGProxy *proxy,
const gchar *package_id,
const gchar *license,
const gchar *group_text,
@@ -555,9 +555,9 @@ pk_client_description_cb (DBusGProxy *proxy,
g_return_if_fail (PK_IS_CLIENT (client));
group = pk_group_enum_from_text (group_text);
- pk_debug ("emit description %s, %s, %i, %s, %s, %ld",
+ pk_debug ("emit details %s, %s, %i, %s, %s, %ld",
package_id, license, group, description, url, (long int) size);
- g_signal_emit (client , signals [PK_CLIENT_DESCRIPTION], 0,
+ g_signal_emit (client , signals [PK_CLIENT_DETAILS], 0,
package_id, license, group, description, url, size);
}
@@ -1761,7 +1761,7 @@ pk_client_resolve (PkClient *client, PkFilterEnum filters, const gchar *package,
* @package_id: a package_id structure such as "gnome-power-manager;0.0.1;i386;fedora"
* @error: a %GError to put the error code and message in, or %NULL
*
- * Det a description of a package, so more information can be obtained for GUI
+ * Get details of a package, so more information can be obtained for GUI
* or command line tools.
*
* Return value: %TRUE if the daemon queued the transaction
@@ -3033,7 +3033,7 @@ pk_client_set_tid (PkClient *client, const gchar *tid, GError **error)
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (proxy, "Description",
+ dbus_g_proxy_add_signal (proxy, "Details",
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64,
G_TYPE_INVALID);
@@ -3063,8 +3063,8 @@ pk_client_set_tid (PkClient *client, const gchar *tid, GError **error)
G_CALLBACK (pk_client_transaction_cb), client, NULL);
dbus_g_proxy_connect_signal (proxy, "UpdateDetail",
G_CALLBACK (pk_client_update_detail_cb), client, NULL);
- dbus_g_proxy_connect_signal (proxy, "Description",
- G_CALLBACK (pk_client_description_cb), client, NULL);
+ dbus_g_proxy_connect_signal (proxy, "Details",
+ G_CALLBACK (pk_client_details_cb), client, NULL);
dbus_g_proxy_connect_signal (proxy, "Files",
G_CALLBACK (pk_client_files_cb), client, NULL);
dbus_g_proxy_connect_signal (proxy, "RepoSignatureRequired",
@@ -3190,7 +3190,7 @@ pk_client_class_init (PkClientClass *klass)
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING);
/**
- * PkClient::description:
+ * PkClient::details:
* @client: the #PkClient instance that emitted the signal
* @package_id: the package_id of the package
* @group: the #PkGroupEnum of the package, e.g. PK_GROUP_ENUM_EDUCATION
@@ -3198,12 +3198,12 @@ pk_client_class_init (PkClientClass *klass)
* @url: the upstream URL of the package
* @size: the size of the package in bytes
*
- * The ::description signal is emitted when GetDetails() is called.
+ * The ::details signal is emitted when GetDetails() is called.
**/
- signals [PK_CLIENT_DESCRIPTION] =
- g_signal_new ("description",
+ signals [PK_CLIENT_DETAILS] =
+ g_signal_new ("details",
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (PkClientClass, description),
+ G_STRUCT_OFFSET (PkClientClass, details),
NULL, NULL, pk_marshal_VOID__STRING_STRING_UINT_STRING_STRING_UINT64,
G_TYPE_NONE, 6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_UINT64);
@@ -3410,8 +3410,8 @@ pk_client_disconnect_proxy (PkClient *client)
G_CALLBACK (pk_client_package_cb), client);
dbus_g_proxy_disconnect_signal (client->priv->proxy, "Transaction",
G_CALLBACK (pk_client_transaction_cb), client);
- dbus_g_proxy_disconnect_signal (client->priv->proxy, "Description",
- G_CALLBACK (pk_client_description_cb), client);
+ dbus_g_proxy_disconnect_signal (client->priv->proxy, "Details",
+ G_CALLBACK (pk_client_details_cb), client);
dbus_g_proxy_disconnect_signal (client->priv->proxy, "Files",
G_CALLBACK (pk_client_files_cb), client);
dbus_g_proxy_disconnect_signal (client->priv->proxy, "RepoSignatureRequired",
@@ -3566,7 +3566,7 @@ pk_client_init (PkClient *client)
dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, G_TYPE_BOOLEAN, G_TYPE_INVALID);
- /* Description */
+ /* Details */
dbus_g_object_register_marshaller (pk_marshal_VOID__STRING_STRING_STRING_STRING_STRING_UINT64,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64,
diff --git a/libpackagekit/pk-client.h b/libpackagekit/pk-client.h
index 1342817..9d39081 100644
--- a/libpackagekit/pk-client.h
+++ b/libpackagekit/pk-client.h
@@ -105,7 +105,7 @@ struct _PkClientClass
const gchar *cve_url,
PkRestartEnum restart,
const gchar *update_text);
- void (* description) (PkClient *client,
+ void (* details) (PkClient *client,
const gchar *package_id,
const gchar *license,
PkGroupEnum group,
diff --git a/python/packagekit/backend.py b/python/packagekit/backend.py
index 1ad7727..268f58b 100644
--- a/python/packagekit/backend.py
+++ b/python/packagekit/backend.py
@@ -127,9 +127,9 @@ class PackageKitBaseBackend:
print "data\t%s" % (data)
sys.stdout.flush()
- def description(self,id,license,group,desc,url,bytes):
+ def details(self,id,license,group,desc,url,bytes):
'''
- Send 'description' signal
+ Send 'details' signal
@param id: The package ID name, e.g. openoffice-clipart;2.6.22;ppc64;fedora
@param license: The license of the package
@param group: The enumerated group
@@ -137,7 +137,7 @@ class PackageKitBaseBackend:
@param url: The upstream project homepage
@param bytes: The size of the package, in bytes
'''
- print >> sys.stdout,"description\t%s\t%s\t%s\t%s\t%s\t%ld" % (id,license,group,desc,url,bytes)
+ print >> sys.stdout,"details\t%s\t%s\t%s\t%s\t%s\t%ld" % (id,license,group,desc,url,bytes)
sys.stdout.flush()
def files(self, id, file_list):
diff --git a/python/packagekit/daemonBackend.py b/python/packagekit/daemonBackend.py
index 5a72cff..96163a5 100644
--- a/python/packagekit/daemonBackend.py
+++ b/python/packagekit/daemonBackend.py
@@ -243,8 +243,8 @@ class PackageKitBaseBackend(dbus.service.Object):
@PKSignalHouseKeeper
@dbus.service.signal(dbus_interface=PACKAGEKIT_DBUS_INTERFACE,
signature='ssssst')
- def Description(self, package_id, license, group, detail, url, size):
- pklog.info("Description (%s, %s, %s, %s, %s, %u)" % (package_id, license, group, detail, url, size))
+ def Details(self, package_id, license, group, detail, url, size):
+ pklog.info("Details (%s, %s, %s, %s, %s, %u)" % (package_id, license, group, detail, url, size))
@PKSignalHouseKeeper
@dbus.service.signal(dbus_interface=PACKAGEKIT_DBUS_INTERFACE,
@@ -673,7 +673,7 @@ class PackageKitBaseBackend(dbus.service.Object):
in_signature='s', out_signature='')
def GetDetails(self, package):
'''
- Print a detailed description for a given package
+ Print a detailed details for a given package
'''
pklog.info("GetDetails(%s)" % package)
self.doGetDetails(package)
diff --git a/python/packagekit/frontend.py b/python/packagekit/frontend.py
index 8481048..3226248 100644
--- a/python/packagekit/frontend.py
+++ b/python/packagekit/frontend.py
@@ -63,8 +63,8 @@ class PackageKit(PackageKitDbusInterface):
self.Package(args[0],args[1],args[2],args[3])
elif kwargs['member'] == "UpdateDetail":
self.UpdateDetail(args[0],args[1],args[2],args[3],args[4],args[5],args[6])
- elif kwargs['member'] == "Description":
- self.Description(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7])
+ elif kwargs['member'] == "Details":
+ self.Details(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7])
elif kwargs['member'] == "ErrorCode":
self.ErrorCode(args[0],args[1],args[2])
elif kwargs['member'] == "RequireRestart":
@@ -122,7 +122,7 @@ class PackageKit(PackageKitDbusInterface):
):
pass
- def Description(self,
+ def Details(self,
jid, # Job ID
package_id,
license,
@@ -224,7 +224,6 @@ class PackageKit(PackageKitDbusInterface):
Lists all packages in groups matching 'pattern'.
'filter' could be 'installed', a repository name, or 'none'.
Causes 'Package' signals for each package found.
- (description is a guess, since this not yet supported in yum backend, and maybe others)
"""
return self.pk_iface.SearchGroup(self.tid(),filter,pattern)
@@ -242,8 +241,7 @@ class PackageKit(PackageKitDbusInterface):
@job_id
def GetDepends(self,package_id,recursive=False):
"""
- Lists package dependancies?
- (description is a guess, since this doesn't seem to work for me)
+ Lists package dependancies
"""
return self.pk_iface.GetDepends(self.tid(),package_id,recursive)
@@ -251,8 +249,7 @@ class PackageKit(PackageKitDbusInterface):
@job_id
def GetRequires(self,package_id,recursive):
"""
- Lists package dependancies?
- (description is a guess, since this not doesn't seem to work for me)
+ Lists package requires
"""
return self.pk_iface.GetRequires(self.tid(),package_id,recursive)
@@ -261,7 +258,6 @@ class PackageKit(PackageKitDbusInterface):
def GetUpdateDetail(self,package_id):
"""
More details about an update.
- (description is a guess, since this not yet supported in yum backend, and maybe others)
"""
return self.pk_iface.GetUpdateDetail(self.tid(),package_id)
@@ -269,8 +265,8 @@ class PackageKit(PackageKitDbusInterface):
@job_id
def GetDetails(self,package_id):
"""
- Gets the Description of a given package_id.
- Causes a 'Description' signal.
+ Gets the Details of a given package_id.
+ Causes a 'Details' signal.
"""
return self.pk_iface.GetDetails(self.tid(),package_id)
diff --git a/python/pk-frontend-test.py b/python/pk-frontend-test.py
index 377952a..378e829 100755
--- a/python/pk-frontend-test.py
+++ b/python/pk-frontend-test.py
@@ -39,7 +39,7 @@ class pkt(PackageKit):
def Package(self,jid,value,name,summary):
print "Package: %s - %s"%(name,summary)
- def Description(self,jid,package_id,license,group,detail,url,size,file_list):
+ def Details(self,jid,package_id,license,group,detail,url,size,file_list):
print "Package: %s" % package_id
print " %s" % url
print " %s" % detail
diff --git a/src/pk-backend-dbus.c b/src/pk-backend-dbus.c
index 1bf5dcd..59baf63 100644
--- a/src/pk-backend-dbus.c
+++ b/src/pk-backend-dbus.c
@@ -144,16 +144,16 @@ pk_backend_dbus_package_cb (DBusGProxy *proxy, const gchar *info_text, const gch
}
/**
- * pk_backend_dbus_description_cb:
+ * pk_backend_dbus_details_cb:
**/
static void
-pk_backend_dbus_description_cb (DBusGProxy *proxy, const gchar *package_id,
+pk_backend_dbus_details_cb (DBusGProxy *proxy, const gchar *package_id,
const gchar *license, const gchar *group_text,
const gchar *detail, const gchar *url,
guint64 size, PkBackendDbus *backend_dbus)
{
pk_debug ("got signal");
- pk_backend_description (backend_dbus->priv->backend, package_id,
+ pk_backend_details (backend_dbus->priv->backend, package_id,
license, pk_group_enum_from_text (group_text), detail, url, size);
}
@@ -329,8 +329,8 @@ pk_backend_dbus_remove_callbacks (PkBackendDbus *backend_dbus)
G_CALLBACK (pk_backend_dbus_no_percentage_updates_cb), backend_dbus);
dbus_g_proxy_disconnect_signal (proxy, "Package",
G_CALLBACK (pk_backend_dbus_package_cb), backend_dbus);
- dbus_g_proxy_disconnect_signal (proxy, "Description",
- G_CALLBACK (pk_backend_dbus_description_cb), backend_dbus);
+ dbus_g_proxy_disconnect_signal (proxy, "Details",
+ G_CALLBACK (pk_backend_dbus_details_cb), backend_dbus);
dbus_g_proxy_disconnect_signal (proxy, "Files",
G_CALLBACK (pk_backend_dbus_files_cb), backend_dbus);
dbus_g_proxy_disconnect_signal (proxy, "UpdateDetail",
@@ -388,7 +388,7 @@ pk_backend_dbus_set_name (PkBackendDbus *backend_dbus, const gchar *service)
dbus_g_proxy_add_signal (proxy, "NoPercentageChanged", G_TYPE_INVALID);
dbus_g_proxy_add_signal (proxy, "Package",
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (proxy, "Description",
+ dbus_g_proxy_add_signal (proxy, "Details",
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
dbus_g_proxy_add_signal (proxy, "Files",
@@ -428,8 +428,8 @@ pk_backend_dbus_set_name (PkBackendDbus *backend_dbus, const gchar *service)
G_CALLBACK (pk_backend_dbus_no_percentage_updates_cb), backend_dbus, NULL);
dbus_g_proxy_connect_signal (proxy, "Package",
G_CALLBACK (pk_backend_dbus_package_cb), backend_dbus, NULL);
- dbus_g_proxy_connect_signal (proxy, "Description",
- G_CALLBACK (pk_backend_dbus_description_cb), backend_dbus, NULL);
+ dbus_g_proxy_connect_signal (proxy, "Details",
+ G_CALLBACK (pk_backend_dbus_details_cb), backend_dbus, NULL);
dbus_g_proxy_connect_signal (proxy, "Files",
G_CALLBACK (pk_backend_dbus_files_cb), backend_dbus, NULL);
dbus_g_proxy_connect_signal (proxy, "UpdateDetail",
@@ -1370,7 +1370,7 @@ pk_backend_dbus_init (PkBackendDbus *backend_dbus)
dbus_g_object_register_marshaller (pk_marshal_VOID__STRING_STRING,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
- /* Description */
+ /* Details */
dbus_g_object_register_marshaller (pk_marshal_VOID__STRING_STRING_STRING_STRING_STRING_UINT64,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64,
diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index 9896948..f9e8b68 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -126,7 +126,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
goto out;
}
pk_backend_package (backend_spawn->priv->backend, info, sections[2], sections[3]);
- } else if (pk_strequal (command, "description")) {
+ } else if (pk_strequal (command, "details")) {
if (size != 7) {
pk_warning ("invalid command '%s'", command);
ret = FALSE;
@@ -144,7 +144,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
text = g_strdup (sections[4]);
/* convert ; to \n as we can't emit them on stdout */
g_strdelimit (text, ";", '\n');
- pk_backend_description (backend_spawn->priv->backend, sections[1], sections[2],
+ pk_backend_details (backend_spawn->priv->backend, sections[1], sections[2],
group, text, sections[5], package_size);
g_free (text);
} else if (pk_strequal (command, "files")) {
diff --git a/src/pk-backend.c b/src/pk-backend.c
index cf09e4d..9502e57 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -116,7 +116,7 @@ static gpointer pk_backend_object = NULL;
enum {
PK_BACKEND_STATUS_CHANGED,
PK_BACKEND_PROGRESS_CHANGED,
- PK_BACKEND_DESCRIPTION,
+ PK_BACKEND_DETAILS,
PK_BACKEND_FILES,
PK_BACKEND_PACKAGE,
PK_BACKEND_UPDATE_DETAIL,
@@ -1019,13 +1019,12 @@ pk_backend_set_transaction_data (PkBackend *backend, const gchar *data)
}
/**
- * pk_backend_description:
+ * pk_backend_details:
**/
gboolean
-pk_backend_description (PkBackend *backend, const gchar *package_id,
- const gchar *license, PkGroupEnum group,
- const gchar *description, const gchar *url,
- gulong size)
+pk_backend_details (PkBackend *backend, const gchar *package_id,
+ const gchar *license, PkGroupEnum group,
+ const gchar *description, const gchar *url, gulong size)
{
gchar *description_safe;
@@ -1042,10 +1041,10 @@ pk_backend_description (PkBackend *backend, const gchar *package_id,
/* replace unsafe chars */
description_safe = pk_strsafe (description);
- pk_debug ("emit description %s, %s, %i, %s, %s, %ld",
+ pk_debug ("emit details %s, %s, %i, %s, %s, %ld",
package_id, license, group, description_safe, url,
size);
- g_signal_emit (backend, signals [PK_BACKEND_DESCRIPTION], 0,
+ g_signal_emit (backend, signals [PK_BACKEND_DETAILS], 0,
package_id, license, group, description_safe, url,
size);
g_free (description_safe);
@@ -1716,8 +1715,8 @@ pk_backend_class_init (PkBackendClass *klass)
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
0, NULL, NULL, g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
- signals [PK_BACKEND_DESCRIPTION] =
- g_signal_new ("description",
+ signals [PK_BACKEND_DETAILS] =
+ g_signal_new ("details",
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
0, NULL, NULL, pk_marshal_VOID__STRING_STRING_UINT_STRING_STRING_UINT64,
G_TYPE_NONE, 6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING,
diff --git a/src/pk-backend.h b/src/pk-backend.h
index 793e55c..d5ad15d 100644
--- a/src/pk-backend.h
+++ b/src/pk-backend.h
@@ -92,7 +92,7 @@ gboolean pk_backend_require_restart (PkBackend *backend,
gboolean pk_backend_message (PkBackend *backend,
PkMessageEnum message,
const gchar *details, ...);
-gboolean pk_backend_description (PkBackend *backend,
+gboolean pk_backend_details (PkBackend *backend,
const gchar *package_id,
const gchar *license,
PkGroupEnum group,
diff --git a/src/pk-interface-transaction.xml b/src/pk-interface-transaction.xml
index 7ba2a4a..4a5d7f7 100644
--- a/src/pk-interface-transaction.xml
+++ b/src/pk-interface-transaction.xml
@@ -156,7 +156,7 @@
<signal name="CallerActiveChanged">
<arg type="b" name="is_active" direction="out"/>
</signal>
- <signal name="Description">
+ <signal name="Details">
<arg type="s" name="package_id" direction="out"/>
<arg type="s" name="license" direction="out"/>
<arg type="s" name="group" direction="out"/>
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 4ac1b51..ca3ac75 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -108,7 +108,7 @@ struct PkTransactionPrivate
PkProvidesEnum cached_provides;
guint signal_allow_cancel;
- guint signal_description;
+ guint signal_details;
guint signal_error_code;
guint signal_files;
guint signal_finished;
@@ -126,7 +126,7 @@ struct PkTransactionPrivate
enum {
PK_TRANSACTION_ALLOW_CANCEL,
PK_TRANSACTION_CALLER_ACTIVE_CHANGED,
- PK_TRANSACTION_DESCRIPTION,
+ PK_TRANSACTION_DETAILS,
PK_TRANSACTION_ERROR_CODE,
PK_TRANSACTION_FILES,
PK_TRANSACTION_FINISHED,
@@ -352,10 +352,10 @@ pk_transaction_caller_active_changed_cb (LibGBus *libgbus, gboolean is_active, P
}
/**
- * pk_transaction_description_cb:
+ * pk_transaction_details_cb:
**/
static void
-pk_transaction_description_cb (PkBackend *backend, const gchar *package_id, const gchar *license, PkGroupEnum group,
+pk_transaction_details_cb (PkBackend *backend, const gchar *package_id, const gchar *license, PkGroupEnum group,
const gchar *detail, const gchar *url,
guint64 size, PkTransaction *transaction)
{
@@ -366,9 +366,9 @@ pk_transaction_description_cb (PkBackend *backend, const gchar *package_id, cons
group_text = pk_group_enum_to_text (group);
- pk_debug ("emitting description %s, %s, %s, %s, %s, %ld",
+ pk_debug ("emitting details %s, %s, %s, %s, %s, %ld",
package_id, license, group_text, detail, url, (long int) size);
- g_signal_emit (transaction, signals [PK_TRANSACTION_DESCRIPTION], 0,
+ g_signal_emit (transaction, signals [PK_TRANSACTION_DETAILS], 0,
package_id, license, group_text, detail, url, size);
}
@@ -486,7 +486,7 @@ pk_transaction_finished_cb (PkBackend *backend, PkExitEnum exit, PkTransaction *
/* disconnect these straight away, as the PkTransaction object takes time to timeout */
g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_allow_cancel);
- g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_description);
+ g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_details);
g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_error_code);
g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_files);
g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_finished);
@@ -755,9 +755,9 @@ pk_transaction_set_running (PkTransaction *transaction)
transaction->priv->signal_allow_cancel =
g_signal_connect (transaction->priv->backend, "allow-cancel",
G_CALLBACK (pk_transaction_allow_cancel_cb), transaction);
- transaction->priv->signal_description =
- g_signal_connect (transaction->priv->backend, "description",
- G_CALLBACK (pk_transaction_description_cb), transaction);
+ transaction->priv->signal_details =
+ g_signal_connect (transaction->priv->backend, "details",
+ G_CALLBACK (pk_transaction_details_cb), transaction);
transaction->priv->signal_error_code =
g_signal_connect (transaction->priv->backend, "error-code",
G_CALLBACK (pk_transaction_error_code_cb), transaction);
@@ -2920,8 +2920,8 @@ pk_transaction_class_init (PkTransactionClass *klass)
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
- signals [PK_TRANSACTION_DESCRIPTION] =
- g_signal_new ("description",
+ signals [PK_TRANSACTION_DETAILS] =
+ g_signal_new ("details",
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
0, NULL, NULL, pk_marshal_VOID__STRING_STRING_STRING_STRING_STRING_UINT64,
G_TYPE_NONE, 6, G_TYPE_STRING,
commit d54d34c3e3d75801c42308333fb301488f89f98f
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 18:05:05 2008 +0100
remove some completed stuff from the todo
diff --git a/TODO b/TODO
index b0a4a89..1ffaaff 100644
--- a/TODO
+++ b/TODO
@@ -2,23 +2,11 @@
* Make PkMessages into proper enumerated types with localised descriptions
-* Add a way to import GPG keys for unsigned packages
- In fedora, if you add a signed repo you have to agree to the GPG key.
-
*** Timeframe: 0.2.0 ***
-* Make the dbus interface sane
- Preview available in src/pk-interface-transaction.xml
-
-* Make installing firmware with udev possible
- http://lists.freedesktop.org/archives/packagekit/2008-March/002430.html
-
* Enable GetUpdateDetail to handle arrays for 'updates' and 'obsoletes'
Until then, use a space to delimit package_id's
-* Add the GetPackages(filter) method to get the complete package list
- Then add a group menu item for this in pk-application
-
* Make one-click installs work
* We need more unit tests.
@@ -31,9 +19,6 @@
*** Timeframe: Sometime in the future ***
-* Split up PolicyKit install into different types
- Have different permissions for signed and unsigned repos.
-
* Fix ServicePack to work correctly:
http://lists.freedesktop.org/archives/packagekit/2008-March/002434.html
commit d376849b9a906b092a5cd6426f6c596ed0c6ca48
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 17:32:51 2008 +0100
rename GetDescription to GetDetails
diff --git a/NEWS b/NEWS
index 3a6c9a7..c3ac711 100644
--- a/NEWS
+++ b/NEWS
@@ -192,7 +192,7 @@ Released: 2008-02-21
* Backends:
- apt: some random fixes to get it work again (Sebastian Heinlein)
- apt2: initial work on a dbus based backend introduced as apt2 (Sebastian Heinlein)
- - apt2: implement GetDescription (Sebastian Heinlein)
+ - apt2: implement GetDetails (Sebastian Heinlein)
- apt2: fix SearchName (Sebastian Heinlein)
- apt2: fix a typo in GetUpdates (Sebastian Heinlein)
- yum: check for missing package in GetUpdateDetail call (Robin Norwood)
@@ -207,7 +207,7 @@ Released: 2008-02-21
- zypp: Added SearchFiles (Stefan Haas)
- zypp: Added SearchDetails (Stefan Haas)
- zypp: Added GetRequires (Stefan Haas)
- - zypp: added missing stuff of GetDescription (Stefan Haas)
+ - zypp: added missing stuff of GetDetails (Stefan Haas)
* New features:
- Allow pkcon to actually remove dependancies on user prompt (Richard Hughes)
diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
index 3ed1e68..df4b068 100644
--- a/backends/alpm/pk-backend-alpm.c
+++ b/backends/alpm/pk-backend-alpm.c
@@ -943,10 +943,10 @@ backend_get_filters (PkBackend *backend)
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
@@ -1069,7 +1069,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
NULL, /* cancel */
NULL, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
NULL, /* get_files */
NULL, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/apt/helpers/Makefile.am b/backends/apt/helpers/Makefile.am
index d412da5..d130747 100644
--- a/backends/apt/helpers/Makefile.am
+++ b/backends/apt/helpers/Makefile.am
@@ -10,7 +10,7 @@ dist_helper_DATA = \
search-group.py \
search-file.py \
get-depends.py \
- get-description.py \
+ get-details.py \
get-repo-list.py \
get-requires.py \
get-update-detail.py \
diff --git a/backends/apt/helpers/aptBackend.py b/backends/apt/helpers/aptBackend.py
index 3c4bff3..bd1025c 100644
--- a/backends/apt/helpers/aptBackend.py
+++ b/backends/apt/helpers/aptBackend.py
@@ -271,9 +271,9 @@ class PackageKitAptBackend(PackageKitBaseBackend):
"Failed to fetch the following items:\n%s" % error_message)
return res
- def get_description(self, package):
+ def get_details(self, package):
'''
- Implement the {backend}-get-description functionality
+ Implement the {backend}-get-details functionality
'''
self.status(STATUS_INFO)
name, version, arch, data = self.get_package_from_id(package)
diff --git a/backends/apt/helpers/get-description.py b/backends/apt/helpers/get-description.py
deleted file mode 100755
index 5f6287d..0000000
--- a/backends/apt/helpers/get-description.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2007 Ali Sabil <ali.sabil at gmail.com>
-#
-# Licensed under the GNU General Public License Version 2
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-import sys
-from aptBackend import PackageKitAptBackend
-
-package = sys.argv[1]
-backend = PackageKitAptBackend(sys.argv[1:])
-backend.get_description(package)
-sys.exit(0)
diff --git a/backends/apt/helpers/get-details.py b/backends/apt/helpers/get-details.py
new file mode 100755
index 0000000..a813640
--- /dev/null
+++ b/backends/apt/helpers/get-details.py
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2007 Ali Sabil <ali.sabil at gmail.com>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import sys
+from aptBackend import PackageKitAptBackend
+
+package = sys.argv[1]
+backend = PackageKitAptBackend(sys.argv[1:])
+backend.get_details(package)
+sys.exit(0)
diff --git a/backends/apt/pk-apt-search-plain.c b/backends/apt/pk-apt-search-plain.c
index 139a012..856f9e7 100644
--- a/backends/apt/pk-apt-search-plain.c
+++ b/backends/apt/pk-apt-search-plain.c
@@ -58,14 +58,14 @@ backend_get_filters (PkBackend *backend)
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
- pk_backend_spawn_helper (spawn, "get-description.py", package_id, NULL);
+ pk_backend_spawn_helper (spawn, "get-details.py", package_id, NULL);
}
/**
diff --git a/backends/apt/pk-apt-search-sqlite.cpp b/backends/apt/pk-apt-search-sqlite.cpp
index 3b48f46..61cc155 100644
--- a/backends/apt/pk-apt-search-sqlite.cpp
+++ b/backends/apt/pk-apt-search-sqlite.cpp
@@ -62,13 +62,13 @@ backend_get_filters (PkBackend *backend)
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
extern "C" void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
- sqlite_get_description(backend,package_id);
+ sqlite_get_details(backend,package_id);
}
/**
diff --git a/backends/apt/pk-apt-search.h b/backends/apt/pk-apt-search.h
index 02ed3c8..e36e89f 100644
--- a/backends/apt/pk-apt-search.h
+++ b/backends/apt/pk-apt-search.h
@@ -28,7 +28,7 @@
void backend_init_search(PkBackend *backend);
void backend_finish_search(PkBackend *backend);
-void backend_get_description (PkBackend *backend, const gchar *package_id);
+void backend_get_details (PkBackend *backend, const gchar *package_id);
void backend_search_details (PkBackend *backend, const gchar *filter, const gchar *search);
void backend_search_name (PkBackend *backend, const gchar *filter, const gchar *search);
void backend_search_group (PkBackend *backend, const gchar *filter, const gchar *search);
diff --git a/backends/apt/pk-backend-apt.c b/backends/apt/pk-backend-apt.c
index 19084c6..f6bf98b 100644
--- a/backends/apt/pk-backend-apt.c
+++ b/backends/apt/pk-backend-apt.c
@@ -229,7 +229,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
NULL, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
NULL, /* get_files */
NULL, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/apt/pk-sqlite-pkg-cache.cpp b/backends/apt/pk-sqlite-pkg-cache.cpp
index 8b60e57..acc08cb 100644
--- a/backends/apt/pk-sqlite-pkg-cache.cpp
+++ b/backends/apt/pk-sqlite-pkg-cache.cpp
@@ -158,9 +158,9 @@ sqlite_search_name (PkBackend *backend, const gchar *filter, const gchar *search
pk_backend_thread_create (backend, sqlite_search_packages_thread);
}
-// sqlite_get_description_thread
+// sqlite_get_details_thread
static gboolean
-sqlite_get_description_thread (PkBackend *backend)
+sqlite_get_details_thread (PkBackend *backend)
{
PkPackageId *pi;
const gchar *package_id;
@@ -204,12 +204,12 @@ sqlite_get_description_thread (PkBackend *backend)
}
/**
- * sqlite_get_description:
+ * sqlite_get_details:
*/
extern "C++" void
-sqlite_get_description (PkBackend *backend, const gchar *package_id)
+sqlite_get_details (PkBackend *backend, const gchar *package_id)
{
- pk_backend_thread_create (backend, sqlite_get_description_thread);
+ pk_backend_thread_create (backend, sqlite_get_details_thread);
return;
}
diff --git a/backends/apt/pk-sqlite-pkg-cache.h b/backends/apt/pk-sqlite-pkg-cache.h
index e9a77a2..68fad42 100644
--- a/backends/apt/pk-sqlite-pkg-cache.h
+++ b/backends/apt/pk-sqlite-pkg-cache.h
@@ -37,6 +37,6 @@ void sqlite_finish_cache(PkBackend *backend);
void sqlite_search_details (PkBackend *backend, const gchar *filter, const gchar *search);
void sqlite_search_name (PkBackend *backend, const gchar *filter, const gchar *search);
void backend_search_common(PkBackend * backend, const gchar * filter, const gchar * search, SearchDepth which, PkBackendThreadFunc func);
-void sqlite_get_description (PkBackend *backend, const gchar *package_id);
+void sqlite_get_details (PkBackend *backend, const gchar *package_id);
#endif
diff --git a/backends/apt2/aptDBUSBackend.py b/backends/apt2/aptDBUSBackend.py
index e38b14d..1e6958d 100755
--- a/backends/apt2/aptDBUSBackend.py
+++ b/backends/apt2/aptDBUSBackend.py
@@ -298,9 +298,9 @@ class PackageKitAptBackend(PackageKitBaseBackend):
self.Finished(EXIT_SUCCESS)
@threaded
- def GetDescription(self, pkg_id):
+ def GetDetails(self, pkg_id):
'''
- Implement the {backend}-get-description functionality
+ Implement the {backend}-get-details functionality
'''
pklog.info("Get description of %s" % pkg_id)
self.StatusChanged(STATUS_INFO)
diff --git a/backends/apt2/pk-backend-apt2.c b/backends/apt2/pk-backend-apt2.c
index a411c3f..437102c 100644
--- a/backends/apt2/pk-backend-apt2.c
+++ b/backends/apt2/pk-backend-apt2.c
@@ -152,14 +152,14 @@ backend_remove_package (PkBackend *backend, const gchar *package_id, gboolean al
}
/**
- * backend_get_description:
+ * backend_get_details:
* */
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
g_return_if_fail (dbus != NULL);
- pk_backend_dbus_get_description (dbus, package_id);
+ pk_backend_dbus_get_details (dbus, package_id);
}
/**
@@ -205,7 +205,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_cancel, /* cancel */
NULL, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
NULL, /* get_files */
NULL, /* get_packages */
NULL, /* get_repo_list */
diff --git a/backends/apt2/test.py b/backends/apt2/test.py
index 82216f8..a1d5ffb 100755
--- a/backends/apt2/test.py
+++ b/backends/apt2/test.py
@@ -71,9 +71,9 @@ try:
if cmd == 'resolve' or cmd == 'all':
print "Testing Resolve(FILTER_NONE,'yum')"
iface.Resolve(FILTER_NONE,'yum')
- if cmd == 'get-description' or cmd == 'all':
- print "Testing GetDescription(PKG_ID)"
- iface.GetDescription(PKG_ID)
+ if cmd == 'get-details' or cmd == 'all':
+ print "Testing GetDetails(PKG_ID)"
+ iface.GetDetails(PKG_ID)
if cmd == 'get-files' or cmd == 'all':
print "Testing GetFiles(PKG_ID)"
iface.GetFiles(PKG_ID)
diff --git a/backends/box/pk-backend-box.c b/backends/box/pk-backend-box.c
index 6b77a39..ebfb775 100644
--- a/backends/box/pk-backend-box.c
+++ b/backends/box/pk-backend-box.c
@@ -267,7 +267,7 @@ backend_install_file_thread (PkBackend *backend)
}
static gboolean
-backend_get_description_thread (PkBackend *backend)
+backend_get_details_thread (PkBackend *backend)
{
PkPackageId *pi;
PackageSearch *ps;
@@ -458,12 +458,12 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
- pk_backend_thread_create (backend, backend_get_description_thread);
+ pk_backend_thread_create (backend, backend_get_details_thread);
}
/**
@@ -668,7 +668,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
NULL, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
NULL, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/conary/helpers/Makefile.am b/backends/conary/helpers/Makefile.am
index 33133a8..6fdd650 100644
--- a/backends/conary/helpers/Makefile.am
+++ b/backends/conary/helpers/Makefile.am
@@ -16,7 +16,7 @@ dist_helper_DATA = \
remove.py \
resolve.py \
update-system.py \
- get-description.py \
+ get-details.py \
get-files.py \
conaryBackend.py \
conaryCallback.py \
diff --git a/backends/conary/helpers/conaryBackend.py b/backends/conary/helpers/conaryBackend.py
index 822d913..af2bd07 100644
--- a/backends/conary/helpers/conaryBackend.py
+++ b/backends/conary/helpers/conaryBackend.py
@@ -524,7 +524,7 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
self.update_detail(id,update,obsolete,vendor_url,bz_url,cve_url,reboot,desc)
@ExceptionHandler
- def get_description(self, id):
+ def get_details(self, id):
'''
Print a detailed description for a given package
'''
diff --git a/backends/conary/helpers/get-description.py b/backends/conary/helpers/get-description.py
deleted file mode 100755
index bfc1f49..0000000
--- a/backends/conary/helpers/get-description.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2007 Ken VanDine <ken at vandine.org>
-#
-# Licensed under the GNU General Public License Version 2
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-import sys
-from conaryBackend import PackageKitConaryBackend
-
-package = sys.argv[1]
-backend = PackageKitConaryBackend(sys.argv[1:])
-backend.get_description(package)
-sys.exit(0)
diff --git a/backends/conary/helpers/get-details.py b/backends/conary/helpers/get-details.py
new file mode 100755
index 0000000..1641283
--- /dev/null
+++ b/backends/conary/helpers/get-details.py
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2007 Ken VanDine <ken at vandine.org>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import sys
+from conaryBackend import PackageKitConaryBackend
+
+package = sys.argv[1]
+backend = PackageKitConaryBackend(sys.argv[1:])
+backend.get_details(package)
+sys.exit(0)
diff --git a/backends/conary/pk-backend-conary.c b/backends/conary/pk-backend-conary.c
index 01d21d3..a649ced 100644
--- a/backends/conary/pk-backend-conary.c
+++ b/backends/conary/pk-backend-conary.c
@@ -112,14 +112,14 @@ backend_cancel (PkBackend *backend)
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
g_return_if_fail (spawn != NULL);
- pk_backend_spawn_helper (spawn, "get-description.py", package_id, NULL);
+ pk_backend_spawn_helper (spawn, "get-details.py", package_id, NULL);
}
/**
@@ -292,7 +292,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_cancel, /* cancel */
NULL, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
NULL, /* get_packages */
NULL, /* get_repo_list */
diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index 854f3ee..ab96961 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -134,10 +134,10 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
@@ -804,7 +804,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_cancel, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
backend_get_packages, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index 97e90c4..4db8a1c 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -574,7 +574,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
NULL, /* cancel */
NULL, /* get_depends */
- NULL, /* get_description */
+ NULL, /* get_details */
NULL, /* get_files */
NULL, /* get_packages */
NULL, /* get_repo_list */
diff --git a/backends/pisi/helpers/Makefile.am b/backends/pisi/helpers/Makefile.am
index 457939e..fe0a9a6 100644
--- a/backends/pisi/helpers/Makefile.am
+++ b/backends/pisi/helpers/Makefile.am
@@ -6,7 +6,7 @@ NULL =
dist_helper_DATA = \
get-depends.py \
get-files.py \
- get-description.py \
+ get-details.py \
get-repo-list.py \
get-requires.py \
get-updates.py \
diff --git a/backends/pisi/helpers/get-description.py b/backends/pisi/helpers/get-description.py
deleted file mode 100644
index 8bfa835..0000000
--- a/backends/pisi/helpers/get-description.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007 S.Çağlar Onur <caglar at pardus.org.tr>
-#
-# Licensed under the GNU General Public License Version 2
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-import sys
-import pisiBackend
-
-backend = pisiBackend.PackageKitPisiBackend(sys.argv[1:])
-backend.get_description(sys.argv[1])
-
-sys.exit()
diff --git a/backends/pisi/helpers/get-details.py b/backends/pisi/helpers/get-details.py
new file mode 100644
index 0000000..4531bd9
--- /dev/null
+++ b/backends/pisi/helpers/get-details.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2007 S.Çağlar Onur <caglar at pardus.org.tr>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import sys
+import pisiBackend
+
+backend = pisiBackend.PackageKitPisiBackend(sys.argv[1:])
+backend.get_details(sys.argv[1])
+
+sys.exit()
diff --git a/backends/pisi/helpers/pisiBackend.py b/backends/pisi/helpers/pisiBackend.py
index 7210889..46c2751 100644
--- a/backends/pisi/helpers/pisiBackend.py
+++ b/backends/pisi/helpers/pisiBackend.py
@@ -161,7 +161,7 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
# Internal FIXME: PiSi API has really inconsistent for return types and arguments!
self.__get_package(pkg.package)
- def get_description(self, package_id):
+ def get_details(self, package_id):
""" Prints a detailed description for a given package """
self.allow_cancel(True)
self.percentage(None)
diff --git a/backends/pisi/pk-backend-pisi.c b/backends/pisi/pk-backend-pisi.c
index d83cf19..a90210e 100644
--- a/backends/pisi/pk-backend-pisi.c
+++ b/backends/pisi/pk-backend-pisi.c
@@ -135,14 +135,14 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
g_return_if_fail (spawn != NULL);
- pk_backend_spawn_helper (spawn, "get-description.py", package_id, NULL);
+ pk_backend_spawn_helper (spawn, "get-details.py", package_id, NULL);
}
/**
@@ -383,7 +383,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_cancel, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
NULL, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c
index 8876b89..f4fb8fb 100644
--- a/backends/poldek/pk-backend-poldek.c
+++ b/backends/poldek/pk-backend-poldek.c
@@ -1383,10 +1383,10 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static gboolean
-backend_get_description_thread (PkBackend *backend)
+backend_get_details_thread (PkBackend *backend)
{
const gchar *package_id;
struct pkg *pkg = NULL;
@@ -1430,13 +1430,13 @@ backend_get_description_thread (PkBackend *backend)
}
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
poldek_backend_set_allow_cancel (backend, FALSE, TRUE);
pb_error_clean ();
- pk_backend_thread_create (backend, backend_get_description_thread);
+ pk_backend_thread_create (backend, backend_get_details_thread);
}
/**
@@ -2224,7 +2224,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_get_cancel, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
backend_get_packages, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/smart/helpers/Makefile.am b/backends/smart/helpers/Makefile.am
index bf6f631..f934aa9 100644
--- a/backends/smart/helpers/Makefile.am
+++ b/backends/smart/helpers/Makefile.am
@@ -5,7 +5,7 @@ NULL =
dist_helper_DATA = \
get-depends.py \
- get-description.py \
+ get-details.py \
get-files.py \
get-repo-list.py \
get-updates.py \
diff --git a/backends/smart/helpers/get-description.py b/backends/smart/helpers/get-description.py
deleted file mode 100755
index 8a2babf..0000000
--- a/backends/smart/helpers/get-description.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2007 Richard Hughes <richard at hughsie.com>
-# Copyright (C) 2007 James Bowes <jbowes at dangerouslyinc.com>
-#
-# Licensed under the GNU General Public License Version 2
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-import sys
-
-from smartBackend import PackageKitSmartBackend
-
-package = sys.argv[1]
-backend = PackageKitSmartBackend(sys.argv[1:])
-backend.get_description(package)
-sys.exit(0)
diff --git a/backends/smart/helpers/get-details.py b/backends/smart/helpers/get-details.py
new file mode 100755
index 0000000..6ef43b5
--- /dev/null
+++ b/backends/smart/helpers/get-details.py
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2007 Richard Hughes <richard at hughsie.com>
+# Copyright (C) 2007 James Bowes <jbowes at dangerouslyinc.com>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import sys
+
+from smartBackend import PackageKitSmartBackend
+
+package = sys.argv[1]
+backend = PackageKitSmartBackend(sys.argv[1:])
+backend.get_details(package)
+sys.exit(0)
diff --git a/backends/smart/helpers/smartBackend.py b/backends/smart/helpers/smartBackend.py
index 538c01e..3680407 100644
--- a/backends/smart/helpers/smartBackend.py
+++ b/backends/smart/helpers/smartBackend.py
@@ -165,7 +165,7 @@ class PackageKitSmartBackend(PackageKitBaseBackend):
for package in packages:
if self._passes_filters(package, filters):
info = package.loaders.keys()[0].getInfo(package)
- if searchstring in info.getDescription():
+ if searchstring in info.GetDetails():
self._show_package(package)
def refresh_cache(self):
@@ -174,7 +174,7 @@ class PackageKitSmartBackend(PackageKitBaseBackend):
self.ctrl.saveSysConf()
@needs_cache
- def get_description(self, packageid):
+ def get_details(self, packageid):
ratio, results, suggestions = self._search_packageid(packageid)
packages = self._process_search_results(results)
@@ -192,7 +192,7 @@ class PackageKitSmartBackend(PackageKitBaseBackend):
info = infos[0]
version, arch = package.version.split('@')
- description = info.getDescription()
+ description = info.GetDetails()
description = description.replace("\n\n", ";")
description = description.replace("\n", " ")
urls = info.getReferenceURLs()
diff --git a/backends/smart/pk-backend-smart.c b/backends/smart/pk-backend-smart.c
index ef86a16..bcba579 100644
--- a/backends/smart/pk-backend-smart.c
+++ b/backends/smart/pk-backend-smart.c
@@ -73,14 +73,14 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
g_return_if_fail (spawn != NULL);
- pk_backend_spawn_helper (spawn, "get-description.py", package_id, NULL);
+ pk_backend_spawn_helper (spawn, "get-details.py", package_id, NULL);
}
/**
@@ -284,7 +284,7 @@ PK_BACKEND_OPTIONS (
NULL, /* get_filters */
NULL, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
NULL, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/test-backend.sh b/backends/test-backend.sh
index cbba51a..c44057c 100755
--- a/backends/test-backend.sh
+++ b/backends/test-backend.sh
@@ -10,7 +10,7 @@ echo "get deps $package_id"
echo "exitcode=$?"
echo "get description $package_id"
-./$backend/helpers/get-description.py $package_id
+./$backend/helpers/get-details.py $package_id
echo "exitcode=$?"
echo "get updates"
diff --git a/backends/test/pk-backend-test-dbus.c b/backends/test/pk-backend-test-dbus.c
index 2005d29..30b187f 100644
--- a/backends/test/pk-backend-test-dbus.c
+++ b/backends/test/pk-backend-test-dbus.c
@@ -87,7 +87,7 @@ PK_BACKEND_OPTIONS (
NULL, /* get_filters */
backend_cancel, /* cancel */
NULL, /* get_depends */
- NULL, /* get_description */
+ NULL, /* get_details */
NULL, /* get_files */
NULL, /* get_packages */
NULL, /* get_repo_list */
diff --git a/backends/test/pk-backend-test-fail.c b/backends/test/pk-backend-test-fail.c
index 75702ac..c48e917 100644
--- a/backends/test/pk-backend-test-fail.c
+++ b/backends/test/pk-backend-test-fail.c
@@ -91,10 +91,10 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
pk_backend_finished (backend);
@@ -275,7 +275,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_cancel, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
NULL, /* get_packages */
NULL, /* get_repo_list */
diff --git a/backends/test/pk-backend-test-nop.c b/backends/test/pk-backend-test-nop.c
index d642095..568573f 100644
--- a/backends/test/pk-backend-test-nop.c
+++ b/backends/test/pk-backend-test-nop.c
@@ -32,7 +32,7 @@ PK_BACKEND_OPTIONS (
NULL, /* get_filters */
NULL, /* cancel */
NULL, /* get_depends */
- NULL, /* get_description */
+ NULL, /* get_details */
NULL, /* get_files */
NULL, /* get_packages */
NULL, /* get_repo_list */
diff --git a/backends/test/pk-backend-test-spawn.c b/backends/test/pk-backend-test-spawn.c
index e69b4c9..6d42f7f 100644
--- a/backends/test/pk-backend-test-spawn.c
+++ b/backends/test/pk-backend-test-spawn.c
@@ -76,7 +76,7 @@ PK_BACKEND_OPTIONS (
NULL, /* get_filters */
NULL, /* cancel */
NULL, /* get_depends */
- NULL, /* get_description */
+ NULL, /* get_details */
NULL, /* get_files */
NULL, /* get_packages */
NULL, /* get_repo_list */
diff --git a/backends/test/pk-backend-test-succeed.c b/backends/test/pk-backend-test-succeed.c
index 76f997e..ca4f948 100644
--- a/backends/test/pk-backend-test-succeed.c
+++ b/backends/test/pk-backend-test-succeed.c
@@ -88,17 +88,17 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
pk_backend_finished (backend);
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
backend_get_files (PkBackend *backend, const gchar *package_id)
@@ -351,7 +351,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_cancel, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
backend_get_packages, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/test/pk-backend-test-thread.c b/backends/test/pk-backend-test-thread.c
index f5b4b90..f67c997 100644
--- a/backends/test/pk-backend-test-thread.c
+++ b/backends/test/pk-backend-test-thread.c
@@ -145,7 +145,7 @@ PK_BACKEND_OPTIONS (
NULL, /* get_filters */
backend_cancel, /* cancel */
NULL, /* get_depends */
- NULL, /* get_description */
+ NULL, /* get_details */
NULL, /* get_files */
NULL, /* get_packages */
NULL, /* get_repo_list */
diff --git a/backends/yum/helpers/Makefile.am b/backends/yum/helpers/Makefile.am
index 68e51f4..1def7fc 100644
--- a/backends/yum/helpers/Makefile.am
+++ b/backends/yum/helpers/Makefile.am
@@ -12,7 +12,7 @@ dist_helper_DATA = \
get-requires.py \
get-files.py \
get-updates.py \
- get-description.py \
+ get-details.py \
get-repo-list.py \
get-packages.py \
repo-enable.py \
diff --git a/backends/yum/helpers/get-description.py b/backends/yum/helpers/get-description.py
deleted file mode 100755
index 459caa4..0000000
--- a/backends/yum/helpers/get-description.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2007 Richard Hughes <richard at hughsie.com>
-# Copyright (C) 2007 Luke Macken <lmacken at redhat.com>
-#
-# Licensed under the GNU General Public License Version 2
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-import sys
-
-from yumBackend import PackageKitYumBackend
-package = sys.argv[1]
-backend = PackageKitYumBackend(sys.argv[1:])
-backend.get_description(package)
-sys.exit(0)
diff --git a/backends/yum/helpers/get-details.py b/backends/yum/helpers/get-details.py
new file mode 100755
index 0000000..0a6e60d
--- /dev/null
+++ b/backends/yum/helpers/get-details.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2007 Richard Hughes <richard at hughsie.com>
+# Copyright (C) 2007 Luke Macken <lmacken at redhat.com>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import sys
+
+from yumBackend import PackageKitYumBackend
+package = sys.argv[1]
+backend = PackageKitYumBackend(sys.argv[1:])
+backend.get_details(package)
+sys.exit(0)
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 728b43b..5f09a78 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -1122,7 +1122,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
else:
self.error(ERROR_PACKAGE_NOT_INSTALLED,"Package %s is not installed" % package)
- def get_description(self,package):
+ def get_details(self,package):
'''
Print a detailed description for a given package
'''
diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index e6bf0ea..6c673ba 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -133,14 +133,14 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
g_return_if_fail (spawn != NULL);
- pk_backend_spawn_helper (spawn, "get-description.py", package_id, NULL);
+ pk_backend_spawn_helper (spawn, "get-details.py", package_id, NULL);
}
/**
@@ -452,7 +452,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_cancel, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
backend_get_packages, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/yum2/helpers/testyum2.py b/backends/yum2/helpers/testyum2.py
index 1d591c6..cdec507 100755
--- a/backends/yum2/helpers/testyum2.py
+++ b/backends/yum2/helpers/testyum2.py
@@ -69,9 +69,9 @@ try:
if cmd == 'resolve' or cmd == 'all':
print "Testing Resolve(FILTER_NONE,'yum')"
iface.Resolve(FILTER_NONE,'yum')
- if cmd == 'get-description' or cmd == 'all':
- print "Testing GetDescription(PKG_ID)"
- iface.GetDescription(PKG_ID)
+ if cmd == 'get-details' or cmd == 'all':
+ print "Testing GetDetails(PKG_ID)"
+ iface.GetDetails(PKG_ID)
if cmd == 'get-files' or cmd == 'all':
print "Testing GetFiles(PKG_ID)"
iface.GetFiles(PKG_ID)
diff --git a/backends/yum2/helpers/yumDBUSBackend.py b/backends/yum2/helpers/yumDBUSBackend.py
index 1540755..d285f4f 100755
--- a/backends/yum2/helpers/yumDBUSBackend.py
+++ b/backends/yum2/helpers/yumDBUSBackend.py
@@ -973,7 +973,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
@threaded
@async
- def doGetDescription(self, package):
+ def doGetDetails(self, package):
'''
Print a detailed description for a given package
'''
diff --git a/backends/yum2/pk-backend-yum2.c b/backends/yum2/pk-backend-yum2.c
index 53836c7..600ddcf 100644
--- a/backends/yum2/pk-backend-yum2.c
+++ b/backends/yum2/pk-backend-yum2.c
@@ -118,14 +118,14 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
g_return_if_fail (dbus != NULL);
- pk_backend_dbus_get_description (dbus, package_id);
+ pk_backend_dbus_get_details (dbus, package_id);
}
/**
@@ -370,7 +370,7 @@ PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
backend_cancel, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
NULL, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index ace0e43..d30b3b2 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -446,7 +446,7 @@ backend_get_depends (PkBackend *backend, PkFilterEnum filters, const gchar *pack
}
static gboolean
-backend_get_description_thread (PkBackend *backend)
+backend_get_details_thread (PkBackend *backend)
{
const gchar *package_id;
PkPackageId *pi;
@@ -533,12 +533,12 @@ backend_get_description_thread (PkBackend *backend)
}
/**
- * backend_get_description:
+ * backend_get_details:
*/
static void
-backend_get_description (PkBackend *backend, const gchar *package_id)
+backend_get_details (PkBackend *backend, const gchar *package_id)
{
- pk_backend_thread_create (backend, backend_get_description_thread);
+ pk_backend_thread_create (backend, backend_get_details_thread);
}
static gboolean
@@ -1627,7 +1627,7 @@ extern "C" PK_BACKEND_OPTIONS (
backend_get_filters, /* get_filters */
NULL, /* cancel */
backend_get_depends, /* get_depends */
- backend_get_description, /* get_description */
+ backend_get_details, /* get_details */
backend_get_files, /* get_files */
backend_get_packages, /* get_packages */
backend_get_repo_list, /* get_repo_list */
diff --git a/client/pk-console.c b/client/pk-console.c
index 6e66486..532f5fb 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -760,10 +760,10 @@ pk_console_get_depends (PkClient *client, const gchar *package, GError **error)
}
/**
- * pk_console_get_description:
+ * pk_console_get_details:
**/
static gboolean
-pk_console_get_description (PkClient *client, const gchar *package, GError **error)
+pk_console_get_details (PkClient *client, const gchar *package, GError **error)
{
gboolean ret;
gchar *package_id;
@@ -772,7 +772,7 @@ pk_console_get_description (PkClient *client, const gchar *package, GError **err
g_print ("%s\n", _("Could not find a description for this package"));
return FALSE;
}
- ret = pk_client_get_description (client, package_id, error);
+ ret = pk_client_get_details (client, package_id, error);
g_free (package_id);
return ret;
}
@@ -1102,8 +1102,8 @@ pk_console_get_summary (PkRoleEnum roles)
if (pk_enums_contain (roles, PK_ROLE_ENUM_GET_REQUIRES)) {
g_string_append_printf (string, " %s\n", "get-requires [package]");
}
- if (pk_enums_contain (roles, PK_ROLE_ENUM_GET_DESCRIPTION)) {
- g_string_append_printf (string, " %s\n", "get-description [package]");
+ if (pk_enums_contain (roles, PK_ROLE_ENUM_GET_DETAILS)) {
+ g_string_append_printf (string, " %s\n", "get-details [package]");
}
if (pk_enums_contain (roles, PK_ROLE_ENUM_GET_FILES)) {
g_string_append_printf (string, " %s\n", "get-files [package]");
@@ -1444,12 +1444,12 @@ main (int argc, char *argv[])
}
ret = pk_client_what_provides (client, filters, PK_PROVIDES_ENUM_CODEC, value, &error);
- } else if (strcmp (mode, "get-description") == 0) {
+ } else if (strcmp (mode, "get-details") == 0) {
if (value == NULL) {
g_print (_("You need to specify a package to find the description for"));
goto out;
}
- ret = pk_console_get_description (client, value, &error);
+ ret = pk_console_get_details (client, value, &error);
} else if (strcmp (mode, "get-files") == 0) {
if (value == NULL) {
diff --git a/contrib/pk-completion.bash b/contrib/pk-completion.bash
index b5163ab..cee522e 100755
--- a/contrib/pk-completion.bash
+++ b/contrib/pk-completion.bash
@@ -20,7 +20,7 @@ __pkcon_commandlist="
accept-eula
get-actions
get-depends
- get-description
+ get-details
get-files
get-filters
get-groups
diff --git a/docs/html/pk-faq.html b/docs/html/pk-faq.html
index 4dd418e..3c17c81 100644
--- a/docs/html/pk-faq.html
+++ b/docs/html/pk-faq.html
@@ -273,7 +273,7 @@
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- zypp -->
</tr>
<tr>
-<td><b>GetDescription</b></td>
+<td><b>GetDetails</b></td>
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- apt -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- apt2 -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- alpm -->
diff --git a/docs/spec/pk-backend-spawn.xml b/docs/spec/pk-backend-spawn.xml
index c6610f3..0d77dd8 100644
--- a/docs/spec/pk-backend-spawn.xml
+++ b/docs/spec/pk-backend-spawn.xml
@@ -116,7 +116,7 @@
</row>
<row>
<entry>Get Description</entry>
- <entry><literal>get-description.*</literal></entry>
+ <entry><literal>get-details.*</literal></entry>
</row>
<row>
<entry>Get Files</entry>
diff --git a/docs/spec/pk-methods.xml b/docs/spec/pk-methods.xml
index c75d5e6..23e6fb2 100644
--- a/docs/spec/pk-methods.xml
+++ b/docs/spec/pk-methods.xml
@@ -653,10 +653,10 @@
</para>
</sect1>
- <sect1 id="methods-get-description">
+ <sect1 id="methods-get-details">
<title>Get Description</title>
<para>
- GetDescription should return the description of that
+ GetDetails should return the description of that
<literal>package_id</literal>.
</para>
<para>
diff --git a/libpackagekit/pk-client.c b/libpackagekit/pk-client.c
index 95213ad..5aec425 100644
--- a/libpackagekit/pk-client.c
+++ b/libpackagekit/pk-client.c
@@ -1756,7 +1756,7 @@ pk_client_resolve (PkClient *client, PkFilterEnum filters, const gchar *package,
}
/**
- * pk_client_get_description:
+ * pk_client_get_details:
* @client: a valid #PkClient instance
* @package_id: a package_id structure such as "gnome-power-manager;0.0.1;i386;fedora"
* @error: a %GError to put the error code and message in, or %NULL
@@ -1767,7 +1767,7 @@ pk_client_resolve (PkClient *client, PkFilterEnum filters, const gchar *package,
* Return value: %TRUE if the daemon queued the transaction
**/
gboolean
-pk_client_get_description (PkClient *client, const gchar *package_id, GError **error)
+pk_client_get_details (PkClient *client, const gchar *package_id, GError **error)
{
gboolean ret;
@@ -1789,7 +1789,7 @@ pk_client_get_description (PkClient *client, const gchar *package_id, GError **e
}
/* save this so we can re-issue it */
- client->priv->role = PK_ROLE_ENUM_GET_DESCRIPTION;
+ client->priv->role = PK_ROLE_ENUM_GET_DETAILS;
client->priv->cached_package_id = g_strdup (package_id);
/* check to see if we have a valid proxy */
@@ -1797,7 +1797,7 @@ pk_client_get_description (PkClient *client, const gchar *package_id, GError **e
pk_client_error_set (error, PK_CLIENT_ERROR_NO_TID, "No proxy for transaction");
return FALSE;
}
- ret = dbus_g_proxy_call (client->priv->proxy, "GetDescription", error,
+ ret = dbus_g_proxy_call (client->priv->proxy, "GetDetails", error,
G_TYPE_STRING, package_id,
G_TYPE_INVALID, G_TYPE_INVALID);
if (ret) {
@@ -2945,8 +2945,8 @@ pk_client_requeue (PkClient *client, GError **error)
ret = pk_client_resolve (client, priv->cached_filters, priv->cached_package_id, error);
} else if (priv->role == PK_ROLE_ENUM_ROLLBACK) {
ret = pk_client_rollback (client, priv->cached_transaction_id, error);
- } else if (priv->role == PK_ROLE_ENUM_GET_DESCRIPTION) {
- ret = pk_client_get_description (client, priv->cached_package_id, error);
+ } else if (priv->role == PK_ROLE_ENUM_GET_DETAILS) {
+ ret = pk_client_get_details (client, priv->cached_package_id, error);
} else if (priv->role == PK_ROLE_ENUM_GET_FILES) {
ret = pk_client_get_files (client, priv->cached_package_id, error);
} else if (priv->role == PK_ROLE_ENUM_GET_REQUIRES) {
@@ -3198,7 +3198,7 @@ pk_client_class_init (PkClientClass *klass)
* @url: the upstream URL of the package
* @size: the size of the package in bytes
*
- * The ::description signal is emitted when GetDescription() is called.
+ * The ::description signal is emitted when GetDetails() is called.
**/
signals [PK_CLIENT_DESCRIPTION] =
g_signal_new ("description",
diff --git a/libpackagekit/pk-client.h b/libpackagekit/pk-client.h
index f99d973..1342817 100644
--- a/libpackagekit/pk-client.h
+++ b/libpackagekit/pk-client.h
@@ -253,7 +253,7 @@ gboolean pk_client_what_provides (PkClient *client,
const gchar *search,
GError **error)
G_GNUC_WARN_UNUSED_RESULT;
-gboolean pk_client_get_description (PkClient *client,
+gboolean pk_client_get_details (PkClient *client,
const gchar *package_id,
GError **error);
gboolean pk_client_get_files (PkClient *client,
diff --git a/libpackagekit/pk-enum.c b/libpackagekit/pk-enum.c
index 921b1e8..96045d4 100644
--- a/libpackagekit/pk-enum.c
+++ b/libpackagekit/pk-enum.c
@@ -84,7 +84,7 @@ static PkEnumMatch enum_role[] = {
{PK_ROLE_ENUM_UNKNOWN, "unknown"}, /* fall though value */
{PK_ROLE_ENUM_CANCEL, "cancel"},
{PK_ROLE_ENUM_GET_DEPENDS, "get-depends"},
- {PK_ROLE_ENUM_GET_DESCRIPTION, "get-description"},
+ {PK_ROLE_ENUM_GET_DETAILS, "get-details"},
{PK_ROLE_ENUM_GET_FILES, "get-files"},
{PK_ROLE_ENUM_GET_PACKAGES, "get-packages"},
{PK_ROLE_ENUM_GET_REPO_LIST, "get-repo-list"},
diff --git a/libpackagekit/pk-enum.h b/libpackagekit/pk-enum.h
index 22336e7..4ec1866 100644
--- a/libpackagekit/pk-enum.h
+++ b/libpackagekit/pk-enum.h
@@ -53,7 +53,7 @@ typedef struct {
typedef enum {
PK_ROLE_ENUM_CANCEL = 1 << 0,
PK_ROLE_ENUM_GET_DEPENDS = 1 << 1,
- PK_ROLE_ENUM_GET_DESCRIPTION = 1 << 2,
+ PK_ROLE_ENUM_GET_DETAILS = 1 << 2,
PK_ROLE_ENUM_GET_FILES = 1 << 3,
PK_ROLE_ENUM_GET_PACKAGES = 1 << 4,
PK_ROLE_ENUM_GET_REPO_LIST = 1 << 5,
diff --git a/python/packagekit/backend.py b/python/packagekit/backend.py
index 40f20b5..1ad7727 100644
--- a/python/packagekit/backend.py
+++ b/python/packagekit/backend.py
@@ -397,9 +397,9 @@ class PackageKitBaseBackend:
'''
self.error(ERROR_NOT_SUPPORTED,"This function is not implemented in this backend")
- def get_description(self, package):
+ def get_details(self, package):
'''
- Implement the {backend}-get-description functionality
+ Implement the {backend}-get-details functionality
Needed to be implemented in a sub class
'''
self.error(ERROR_NOT_SUPPORTED,"This function is not implemented in this backend")
diff --git a/python/packagekit/daemonBackend.py b/python/packagekit/daemonBackend.py
index 04277c0..5a72cff 100644
--- a/python/packagekit/daemonBackend.py
+++ b/python/packagekit/daemonBackend.py
@@ -671,14 +671,14 @@ class PackageKitBaseBackend(dbus.service.Object):
@dbus.service.method(PACKAGEKIT_DBUS_INTERFACE,
in_signature='s', out_signature='')
- def GetDescription(self, package):
+ def GetDetails(self, package):
'''
Print a detailed description for a given package
'''
- pklog.info("GetDescription(%s)" % package)
- self.doGetDescription(package)
+ pklog.info("GetDetails(%s)" % package)
+ self.doGetDetails(package)
- def doGetDescription(self, package):
+ def doGetDetails(self, package):
'''
Should be replaced in the corresponding backend sub class
'''
diff --git a/python/packagekit/frontend.py b/python/packagekit/frontend.py
index 8e01c50..8481048 100644
--- a/python/packagekit/frontend.py
+++ b/python/packagekit/frontend.py
@@ -267,12 +267,12 @@ class PackageKit(PackageKitDbusInterface):
@dbusException
@job_id
- def GetDescription(self,package_id):
+ def GetDetails(self,package_id):
"""
Gets the Description of a given package_id.
Causes a 'Description' signal.
"""
- return self.pk_iface.GetDescription(self.tid(),package_id)
+ return self.pk_iface.GetDetails(self.tid(),package_id)
@dbusException
@job_id
diff --git a/python/pk-frontend-test.py b/python/pk-frontend-test.py
index 02f5f21..377952a 100755
--- a/python/pk-frontend-test.py
+++ b/python/pk-frontend-test.py
@@ -83,7 +83,7 @@ def desc(*args):
if len(args)!=1 or len(args[0])!=1:
print "desc only takes single arg"
raise PackageKitTransactionFailure
- return p.GetDescription(args[0][0])
+ return p.GetDetails(args[0][0])
def depends(*args):
if len(args)!=1 or len(args[0])!=1:
diff --git a/src/pk-backend-dbus.c b/src/pk-backend-dbus.c
index 9bdb699..1bf5dcd 100644
--- a/src/pk-backend-dbus.c
+++ b/src/pk-backend-dbus.c
@@ -1046,10 +1046,10 @@ pk_backend_dbus_get_update_detail (PkBackendDbus *backend_dbus, const gchar *pac
}
/**
- * pk_backend_dbus_get_description:
+ * pk_backend_dbus_get_details:
**/
gboolean
-pk_backend_dbus_get_description (PkBackendDbus *backend_dbus, const gchar *package_id)
+pk_backend_dbus_get_details (PkBackendDbus *backend_dbus, const gchar *package_id)
{
gboolean ret;
GError *error = NULL;
@@ -1060,7 +1060,7 @@ pk_backend_dbus_get_description (PkBackendDbus *backend_dbus, const gchar *packa
/* new sync method call */
pk_backend_dbus_time_reset (backend_dbus);
- ret = dbus_g_proxy_call (backend_dbus->priv->proxy, "GetDescription", &error,
+ ret = dbus_g_proxy_call (backend_dbus->priv->proxy, "GetDetails", &error,
G_TYPE_STRING, package_id,
G_TYPE_INVALID, G_TYPE_INVALID);
if (error != NULL) {
diff --git a/src/pk-backend-dbus.h b/src/pk-backend-dbus.h
index 700bde9..c890313 100644
--- a/src/pk-backend-dbus.h
+++ b/src/pk-backend-dbus.h
@@ -95,7 +95,7 @@ gboolean pk_backend_dbus_get_requires (PkBackendDbus *backend_dbus,
gboolean recursive);
gboolean pk_backend_dbus_get_update_detail (PkBackendDbus *backend_dbus,
const gchar *package_id);
-gboolean pk_backend_dbus_get_description (PkBackendDbus *backend_dbus,
+gboolean pk_backend_dbus_get_details (PkBackendDbus *backend_dbus,
const gchar *package_id);
gboolean pk_backend_dbus_get_files (PkBackendDbus *backend_dbus,
const gchar *package_id);
diff --git a/src/pk-backend.c b/src/pk-backend.c
index 004ad62..cf09e4d 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -186,8 +186,8 @@ pk_backend_get_actions (PkBackend *backend)
if (desc->get_depends != NULL) {
pk_enums_add (roles, PK_ROLE_ENUM_GET_DEPENDS);
}
- if (desc->get_description != NULL) {
- pk_enums_add (roles, PK_ROLE_ENUM_GET_DESCRIPTION);
+ if (desc->get_details != NULL) {
+ pk_enums_add (roles, PK_ROLE_ENUM_GET_DETAILS);
}
if (desc->get_files != NULL) {
pk_enums_add (roles, PK_ROLE_ENUM_GET_FILES);
diff --git a/src/pk-backend.h b/src/pk-backend.h
index 37e4929..793e55c 100644
--- a/src/pk-backend.h
+++ b/src/pk-backend.h
@@ -180,7 +180,7 @@ typedef struct {
PkFilterEnum filters,
const gchar *package_id,
gboolean recursive);
- void (*get_description) (PkBackend *backend,
+ void (*get_details) (PkBackend *backend,
const gchar *package_id);
void (*get_files) (PkBackend *backend,
const gchar *package_id);
@@ -249,7 +249,7 @@ typedef struct {
} PkBackendDesc;
#define PK_BACKEND_OPTIONS(description, author, initialize, destroy, get_filters, get_groups, cancel, \
- get_depends, get_description, get_files, get_packages, get_repo_list, get_requires, \
+ get_depends, get_details, get_files, get_packages, get_repo_list, get_requires, \
get_update_detail, get_updates, install_file, install_package, \
install_signature, refresh_cache, remove_package, repo_enable, \
repo_set_data, resolve, rollback, search_details, search_file, search_group, \
@@ -263,7 +263,7 @@ typedef struct {
get_groups, \
cancel, \
get_depends, \
- get_description, \
+ get_details, \
get_files, \
get_packages, \
get_repo_list, \
diff --git a/src/pk-interface-transaction.xml b/src/pk-interface-transaction.xml
index 4565d81..7ba2a4a 100644
--- a/src/pk-interface-transaction.xml
+++ b/src/pk-interface-transaction.xml
@@ -19,7 +19,7 @@
<arg type="s" name="package_id" direction="in"/>
<arg type="b" name="recursive" direction="in"/>
</method>
- <method name="GetDescription">
+ <method name="GetDetails">
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<arg type="s" name="package_id" direction="in"/>
</method>
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 2239eeb..4ac1b51 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -828,8 +828,8 @@ pk_transaction_set_running (PkTransaction *transaction)
desc->resolve (priv->backend, priv->cached_filters, priv->cached_package_id);
} else if (priv->role == PK_ROLE_ENUM_ROLLBACK) {
desc->rollback (priv->backend, priv->cached_transaction_id);
- } else if (priv->role == PK_ROLE_ENUM_GET_DESCRIPTION) {
- desc->get_description (priv->backend, priv->cached_package_id);
+ } else if (priv->role == PK_ROLE_ENUM_GET_DETAILS) {
+ desc->get_details (priv->backend, priv->cached_package_id);
} else if (priv->role == PK_ROLE_ENUM_GET_FILES) {
desc->get_files (priv->backend, priv->cached_package_id);
} else if (priv->role == PK_ROLE_ENUM_GET_REQUIRES) {
@@ -1279,10 +1279,10 @@ pk_transaction_get_depends (PkTransaction *transaction, const gchar *filter, con
}
/**
- * pk_transaction_get_description:
+ * pk_transaction_get_details:
**/
void
-pk_transaction_get_description (PkTransaction *transaction, const gchar *package_id,
+pk_transaction_get_details (PkTransaction *transaction, const gchar *package_id,
DBusGMethodInvocation *context)
{
gboolean ret;
@@ -1291,11 +1291,11 @@ pk_transaction_get_description (PkTransaction *transaction, const gchar *package
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- pk_debug ("GetDescription method called: %s", package_id);
+ pk_debug ("GetDetails method called: %s", package_id);
/* not implemented yet */
- if (transaction->priv->backend->desc->get_description == NULL) {
- pk_debug ("Not implemented yet: GetDescription");
+ if (transaction->priv->backend->desc->get_details == NULL) {
+ pk_debug ("Not implemented yet: GetDetails");
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_NOT_SUPPORTED,
"Operation not yet supported by backend");
dbus_g_method_return_error (context, error);
@@ -1326,7 +1326,7 @@ pk_transaction_get_description (PkTransaction *transaction, const gchar *package
/* save so we can run later */
transaction->priv->cached_package_id = g_strdup (package_id);
transaction->priv->status = PK_STATUS_ENUM_WAIT;
- pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_DESCRIPTION);
+ pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_DETAILS);
/* try to commit this */
ret = pk_transaction_commit (transaction);
diff --git a/src/pk-transaction.h b/src/pk-transaction.h
index 8d9200c..12c56e4 100644
--- a/src/pk-transaction.h
+++ b/src/pk-transaction.h
@@ -108,7 +108,7 @@ void pk_transaction_get_depends (PkTransaction *transaction,
const gchar *package_id,
gboolean recursive,
DBusGMethodInvocation *context);
-void pk_transaction_get_description (PkTransaction *transaction,
+void pk_transaction_get_details (PkTransaction *transaction,
const gchar *package_id,
DBusGMethodInvocation *context);
void pk_transaction_get_files (PkTransaction *transaction,
commit c6204607b42a663ce13077bc54fb107c436f8325
Author: Thomas Wood <thomas at openedhand.com>
Date: Fri May 2 16:59:10 2008 +0100
opkg: add missing backend reference for callbacks
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index 9b64242..d86be24 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -315,6 +315,7 @@ backend_search_description (PkBackend *backend, PkFilterEnum filters, const gcha
params->filters = filters;
params->search_type = SEARCH_DESCRIPTION;
params->needle = g_utf8_strdown (search, -1);
+ params->backend = backend;
pk_backend_set_pointer (backend, "search-params", params);
pk_backend_thread_create (backend, backend_search_thread);
@@ -334,6 +335,7 @@ backend_search_group (PkBackend *backend, PkFilterEnum filters, const gchar *sea
params->filters = filters;
params->search_type = SEARCH_TAG;
params->needle = g_strdup_printf ("group::%s", search);
+ params->backend = backend;
pk_backend_set_pointer (backend, "search-params", params);
pk_backend_thread_create (backend, backend_search_thread);
commit 65ae7ce5476d258e1b6c2311645d40d1cf12c679
Author: Thomas Wood <thomas at openedhand.com>
Date: Fri May 2 16:58:15 2008 +0100
opkg: add some checks for NULL search parameters
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index 97e90c4..9b64242 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -209,6 +209,8 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data)
switch (params->search_type)
{
case SEARCH_NAME:
+ if (!pkg->name)
+ return;
haystack = g_utf8_strdown (pkg->name, -1);
match = (g_strrstr (haystack, params->needle) != NULL);
g_free (haystack);
@@ -216,6 +218,8 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data)
return;
break;
case SEARCH_DESCRIPTION:
+ if (!pkg->description)
+ return;
haystack = g_utf8_strdown (pkg->description, -1);
match = (g_strrstr (haystack, params->needle) != NULL);
g_free (haystack);
@@ -223,6 +227,8 @@ pk_opkg_package_list_cb (opkg_t *opkg, opkg_package_t *pkg, void *data)
return;
break;
case SEARCH_TAG:
+ if (!pkg->tags)
+ return;
if (!g_strrstr (pkg->tags, params->needle))
return;
break;
commit d9c31c138cac849c9c31b93d3083596047383bcc
Merge: d368d6b... f65d83c...
Author: Robin Norwood <rnorwood at redhat.com>
Date: Fri May 2 10:10:24 2008 -0400
Merge branch 'master' of git+ssh://rnorwood@git.packagekit.org/srv/git/PackageKit
commit d368d6bcecb5325d453062aad5c3bc9ded85b345
Merge: 3b29df4... 71ae7f2...
Author: Robin Norwood <rnorwood at redhat.com>
Date: Thu May 1 13:05:53 2008 -0400
Merge branch 'master' of git+ssh://rnorwood@git.packagekit.org/srv/git/PackageKit
commit 3b29df416c68da607e9747721fe8fbe4309d4221
Author: Robin Norwood <rnorwood at redhat.com>
Date: Thu May 1 09:03:43 2008 -0400
Add xerox license to 'free' list.
diff --git a/libpackagekit/pk-enum.c b/libpackagekit/pk-enum.c
index 526c0ee..56af0b9 100644
--- a/libpackagekit/pk-enum.c
+++ b/libpackagekit/pk-enum.c
@@ -403,6 +403,7 @@ static PkEnumMatch enum_free_licenses[] = {
{PK_LICENSE_ENUM_STIX, "STIX"},
{PK_LICENSE_ENUM_XANO, "XANO"},
{PK_LICENSE_ENUM_VOSTROM, "VOSTROM"},
+ {PK_LICENSE_ENUM_XEROX, "Xerox License"},
{0, NULL}
};
diff --git a/libpackagekit/pk-enum.h b/libpackagekit/pk-enum.h
index a28fa17..f26acd5 100644
--- a/libpackagekit/pk-enum.h
+++ b/libpackagekit/pk-enum.h
@@ -477,6 +477,7 @@ typedef enum {
PK_LICENSE_ENUM_STIX,
PK_LICENSE_ENUM_XANO,
PK_LICENSE_ENUM_VOSTROM,
+ PK_LICENSE_ENUM_XEROX,
PK_LICENSE_ENUM_UNKNOWN
} PkLicenseEnum;
More information about the PackageKit-commit
mailing list