[PackageKit-commit] packagekit: Branch 'master' - 8 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Thu Apr 17 09:13:00 PDT 2008
Makefile.am | 1
backends/yum/helpers/yumBackend.py | 18 +++++++++++++
backends/zypp/pk-backend-zypp.cpp | 10 +++++--
dev/null |binary
docs/html/img/Makefile.am | 40 +++++++++++++++++--------------
docs/html/img/gpk-added-deps.png |binary
docs/html/img/gpk-application-groups.png |binary
docs/html/img/gpk-application-search.png |binary
docs/html/img/gpk-auto-update.png |binary
docs/html/img/gpk-backend-status.png |binary
docs/html/img/gpk-battery.png |binary
docs/html/img/gpk-inhibit.png |binary
docs/html/img/gpk-log.png |binary
docs/html/img/gpk-network.png |binary
docs/html/img/gpk-prefs.png |binary
docs/html/img/gpk-progress.png |binary
docs/html/img/gpk-remove-confirm.png |binary
docs/html/img/gpk-repo-auth.png |binary
docs/html/img/gpk-repo.png |binary
docs/html/img/gpk-require-restart.png |binary
docs/html/img/gpk-updates-overview.png |binary
docs/html/img/gpk-updates-warning.png |binary
docs/html/img/gpk-updates.png |binary
docs/html/img/gpk-waiting.png |binary
docs/html/pk-screenshots.html | 36 +++++++++++++--------------
src/pk-engine.c | 12 +++++++--
26 files changed, 75 insertions(+), 42 deletions(-)
New commits:
commit e472d73f52c67f92ea0f4a213adfe76a26e45eb6
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Apr 17 17:06:49 2008 +0100
wait for network to come back up before refreshing after a suspend. fixes rh#442166
diff --git a/src/pk-engine.c b/src/pk-engine.c
index c081251..a269699 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -74,9 +74,9 @@ static void pk_engine_finalize (GObject *object);
*
* We probably also need to wait for NetworkManager to come back up if we are
* resuming, and we probably don't want to be doing this at a busy time after
- * a yum tramsaction.
+ * a yum transaction.
*/
-#define PK_ENGINE_STATE_CHANGED_TIMEOUT 5 /* seconds */
+#define PK_ENGINE_STATE_CHANGED_TIMEOUT 10 /* seconds */
struct PkEnginePrivate
{
@@ -278,10 +278,18 @@ pk_engine_get_transaction_list (PkEngine *engine, gchar ***transaction_list, GEr
static gboolean
pk_engine_state_changed_cb (gpointer data)
{
+ gboolean ret;
PkEngine *engine = PK_ENGINE (data);
g_return_val_if_fail (PK_IS_ENGINE (engine), FALSE);
+ /* if NetworkManager is not up, then just reschedule */
+ ret = pk_network_is_online (engine->priv->network);
+ if (!ret) {
+ /* wait another timeout of PK_ENGINE_STATE_CHANGED_TIMEOUT */
+ return TRUE;
+ }
+
pk_debug ("unreffing updates cache as state may have changed");
pk_cache_invalidate (engine->priv->cache);
commit db9ea9c7e3eeaea06166dca74bf5adb7b15367bd
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Apr 17 16:51:21 2008 +0100
correct the location of the images
diff --git a/docs/html/img/Makefile.am b/docs/html/img/Makefile.am
index 373e648..1b1a645 100644
--- a/docs/html/img/Makefile.am
+++ b/docs/html/img/Makefile.am
@@ -9,23 +9,29 @@ IMAGE_FILES = \
large-preferences-system.png \
large-system-users.png \
packagekit.png \
- pk-application-search.png \
- pk-application-groups.png \
- pk-auto-update.png \
- pk-backend-status.png \
- pk-battery.png \
- pk-inhibit.png \
- pk-network.png \
- pk-prefs.png \
- pk-progress.png \
- pk-repo-auth.png \
- pk-repo.png \
- pk-require-restart.png \
- pk-transactions.png \
- pk-updates.png \
- pk-updates-warning.png \
- pk-waiting.png \
- pk-remove-confirm.png \
+ pk-update-bugfix.png \
+ pk-update-enhancement.png \
+ pk-update-high.png \
+ pk-update-low.png \
+ pk-update-normal.png \
+ pk-update-security.png \
+ gpk-application-search.png \
+ gpk-application-groups.png \
+ gpk-auto-update.png \
+ gpk-backend-status.png \
+ gpk-battery.png \
+ gpk-inhibit.png \
+ gpk-network.png \
+ gpk-prefs.png \
+ gpk-progress.png \
+ gpk-repo-auth.png \
+ gpk-repo.png \
+ gpk-require-restart.png \
+ gpk-log.png \
+ gpk-updates.png \
+ gpk-updates-warning.png \
+ gpk-waiting.png \
+ gpk-remove-confirm.png \
$(NULL)
EXTRA_DIST = \
commit 0cd2b50fc5c93325c64a3455fb723a598972caf4
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Apr 17 16:50:51 2008 +0100
we need --enable-local for make distcheck to pass
diff --git a/Makefile.am b/Makefile.am
index 460040b..ad828e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,6 +98,5 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--with-security-framework=dummy \
--disable-developer \
- --disable-local \
$(NULL)
commit e97db8f2b88b8b600c380716a1ce779d71dcd21a
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Apr 17 15:11:09 2008 +0100
update a screenshot
diff --git a/docs/html/img/gpk-log.png b/docs/html/img/gpk-log.png
index d2c2214..0a62ca5 100644
Binary files a/docs/html/img/gpk-log.png and b/docs/html/img/gpk-log.png differ
commit f9160b822c3b4a541ca3df6c93ef907fef0b2822
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Apr 17 15:08:54 2008 +0100
rename some screenshots as they are GNOME screenshots, not generic ones
diff --git a/docs/html/img/gpk-added-deps.png b/docs/html/img/gpk-added-deps.png
new file mode 100644
index 0000000..8cc922e
Binary files /dev/null and b/docs/html/img/gpk-added-deps.png differ
diff --git a/docs/html/img/gpk-application-groups.png b/docs/html/img/gpk-application-groups.png
new file mode 100644
index 0000000..c6a83af
Binary files /dev/null and b/docs/html/img/gpk-application-groups.png differ
diff --git a/docs/html/img/gpk-application-search.png b/docs/html/img/gpk-application-search.png
new file mode 100644
index 0000000..daa1376
Binary files /dev/null and b/docs/html/img/gpk-application-search.png differ
diff --git a/docs/html/img/gpk-auto-update.png b/docs/html/img/gpk-auto-update.png
new file mode 100644
index 0000000..25ff374
Binary files /dev/null and b/docs/html/img/gpk-auto-update.png differ
diff --git a/docs/html/img/gpk-backend-status.png b/docs/html/img/gpk-backend-status.png
new file mode 100644
index 0000000..1cdc711
Binary files /dev/null and b/docs/html/img/gpk-backend-status.png differ
diff --git a/docs/html/img/gpk-battery.png b/docs/html/img/gpk-battery.png
new file mode 100644
index 0000000..b6d5837
Binary files /dev/null and b/docs/html/img/gpk-battery.png differ
diff --git a/docs/html/img/gpk-inhibit.png b/docs/html/img/gpk-inhibit.png
new file mode 100644
index 0000000..35dc714
Binary files /dev/null and b/docs/html/img/gpk-inhibit.png differ
diff --git a/docs/html/img/gpk-log.png b/docs/html/img/gpk-log.png
new file mode 100644
index 0000000..d2c2214
Binary files /dev/null and b/docs/html/img/gpk-log.png differ
diff --git a/docs/html/img/gpk-network.png b/docs/html/img/gpk-network.png
new file mode 100644
index 0000000..94c6fad
Binary files /dev/null and b/docs/html/img/gpk-network.png differ
diff --git a/docs/html/img/gpk-prefs.png b/docs/html/img/gpk-prefs.png
new file mode 100644
index 0000000..25a2cb0
Binary files /dev/null and b/docs/html/img/gpk-prefs.png differ
diff --git a/docs/html/img/gpk-progress.png b/docs/html/img/gpk-progress.png
new file mode 100644
index 0000000..440214c
Binary files /dev/null and b/docs/html/img/gpk-progress.png differ
diff --git a/docs/html/img/gpk-remove-confirm.png b/docs/html/img/gpk-remove-confirm.png
new file mode 100644
index 0000000..b7cbb8c
Binary files /dev/null and b/docs/html/img/gpk-remove-confirm.png differ
diff --git a/docs/html/img/gpk-repo-auth.png b/docs/html/img/gpk-repo-auth.png
new file mode 100644
index 0000000..621c6d4
Binary files /dev/null and b/docs/html/img/gpk-repo-auth.png differ
diff --git a/docs/html/img/gpk-repo.png b/docs/html/img/gpk-repo.png
new file mode 100644
index 0000000..aa6fc66
Binary files /dev/null and b/docs/html/img/gpk-repo.png differ
diff --git a/docs/html/img/gpk-require-restart.png b/docs/html/img/gpk-require-restart.png
new file mode 100644
index 0000000..61d0ec3
Binary files /dev/null and b/docs/html/img/gpk-require-restart.png differ
diff --git a/docs/html/img/gpk-updates-overview.png b/docs/html/img/gpk-updates-overview.png
new file mode 100644
index 0000000..3175ddb
Binary files /dev/null and b/docs/html/img/gpk-updates-overview.png differ
diff --git a/docs/html/img/gpk-updates-warning.png b/docs/html/img/gpk-updates-warning.png
new file mode 100644
index 0000000..e1ad35d
Binary files /dev/null and b/docs/html/img/gpk-updates-warning.png differ
diff --git a/docs/html/img/gpk-updates.png b/docs/html/img/gpk-updates.png
new file mode 100644
index 0000000..0514938
Binary files /dev/null and b/docs/html/img/gpk-updates.png differ
diff --git a/docs/html/img/gpk-waiting.png b/docs/html/img/gpk-waiting.png
new file mode 100644
index 0000000..331c001
Binary files /dev/null and b/docs/html/img/gpk-waiting.png differ
diff --git a/docs/html/img/pk-added-deps.png b/docs/html/img/pk-added-deps.png
deleted file mode 100644
index 8cc922e..0000000
Binary files a/docs/html/img/pk-added-deps.png and /dev/null differ
diff --git a/docs/html/img/pk-application-groups.png b/docs/html/img/pk-application-groups.png
deleted file mode 100644
index c6a83af..0000000
Binary files a/docs/html/img/pk-application-groups.png and /dev/null differ
diff --git a/docs/html/img/pk-application-search.png b/docs/html/img/pk-application-search.png
deleted file mode 100644
index daa1376..0000000
Binary files a/docs/html/img/pk-application-search.png and /dev/null differ
diff --git a/docs/html/img/pk-auto-update.png b/docs/html/img/pk-auto-update.png
deleted file mode 100644
index 25ff374..0000000
Binary files a/docs/html/img/pk-auto-update.png and /dev/null differ
diff --git a/docs/html/img/pk-backend-status.png b/docs/html/img/pk-backend-status.png
deleted file mode 100644
index 1cdc711..0000000
Binary files a/docs/html/img/pk-backend-status.png and /dev/null differ
diff --git a/docs/html/img/pk-battery.png b/docs/html/img/pk-battery.png
deleted file mode 100644
index b6d5837..0000000
Binary files a/docs/html/img/pk-battery.png and /dev/null differ
diff --git a/docs/html/img/pk-inhibit.png b/docs/html/img/pk-inhibit.png
deleted file mode 100644
index 35dc714..0000000
Binary files a/docs/html/img/pk-inhibit.png and /dev/null differ
diff --git a/docs/html/img/pk-network.png b/docs/html/img/pk-network.png
deleted file mode 100644
index 94c6fad..0000000
Binary files a/docs/html/img/pk-network.png and /dev/null differ
diff --git a/docs/html/img/pk-prefs.png b/docs/html/img/pk-prefs.png
deleted file mode 100644
index 25a2cb0..0000000
Binary files a/docs/html/img/pk-prefs.png and /dev/null differ
diff --git a/docs/html/img/pk-progress.png b/docs/html/img/pk-progress.png
deleted file mode 100644
index 440214c..0000000
Binary files a/docs/html/img/pk-progress.png and /dev/null differ
diff --git a/docs/html/img/pk-remove-confirm.png b/docs/html/img/pk-remove-confirm.png
deleted file mode 100644
index b7cbb8c..0000000
Binary files a/docs/html/img/pk-remove-confirm.png and /dev/null differ
diff --git a/docs/html/img/pk-repo-auth.png b/docs/html/img/pk-repo-auth.png
deleted file mode 100644
index 621c6d4..0000000
Binary files a/docs/html/img/pk-repo-auth.png and /dev/null differ
diff --git a/docs/html/img/pk-repo.png b/docs/html/img/pk-repo.png
deleted file mode 100644
index aa6fc66..0000000
Binary files a/docs/html/img/pk-repo.png and /dev/null differ
diff --git a/docs/html/img/pk-require-restart.png b/docs/html/img/pk-require-restart.png
deleted file mode 100644
index 61d0ec3..0000000
Binary files a/docs/html/img/pk-require-restart.png and /dev/null differ
diff --git a/docs/html/img/pk-transactions.png b/docs/html/img/pk-transactions.png
deleted file mode 100644
index d2c2214..0000000
Binary files a/docs/html/img/pk-transactions.png and /dev/null differ
diff --git a/docs/html/img/pk-updates-overview.png b/docs/html/img/pk-updates-overview.png
deleted file mode 100644
index 3175ddb..0000000
Binary files a/docs/html/img/pk-updates-overview.png and /dev/null differ
diff --git a/docs/html/img/pk-updates-warning.png b/docs/html/img/pk-updates-warning.png
deleted file mode 100644
index e1ad35d..0000000
Binary files a/docs/html/img/pk-updates-warning.png and /dev/null differ
diff --git a/docs/html/img/pk-updates.png b/docs/html/img/pk-updates.png
deleted file mode 100644
index 0514938..0000000
Binary files a/docs/html/img/pk-updates.png and /dev/null differ
diff --git a/docs/html/img/pk-waiting.png b/docs/html/img/pk-waiting.png
deleted file mode 100644
index 331c001..0000000
Binary files a/docs/html/img/pk-waiting.png and /dev/null differ
diff --git a/docs/html/pk-screenshots.html b/docs/html/pk-screenshots.html
index 5f4241a..ac7fece 100644
--- a/docs/html/pk-screenshots.html
+++ b/docs/html/pk-screenshots.html
@@ -20,58 +20,58 @@
<h1>Screenshots</h1>
-<center><img src="img/pk-application-search.png" alt="[img]"/></center>
+<center><img src="img/gpk-application-search.png" alt="[img]"/></center>
<p class="caption">Add/Remove Software search</p>
-<center><img src="img/pk-application-groups.png" alt="[img]"/></center>
+<center><img src="img/gpk-application-groups.png" alt="[img]"/></center>
<p class="caption">Add/Remove Software groups</p>
-<center><img src="img/pk-transactions.png" alt="[img]"/></center>
+<center><img src="img/gpk-log.png" alt="[img]"/></center>
<p class="caption">Transaction viewer</p>
-<center><img src="img/pk-updates-overview.png" alt="[img]"/></center>
+<center><img src="img/gpk-updates-overview.png" alt="[img]"/></center>
<p class="caption">Update viewer overview</p>
-<center><img src="img/pk-updates.png" alt="[img]"/></center>
+<center><img src="img/gpk-updates.png" alt="[img]"/></center>
<p class="caption">Update viewer</p>
-<center><img src="img/pk-prefs.png" alt="[img]"/></center>
+<center><img src="img/gpk-prefs.png" alt="[img]"/></center>
<p class="caption">Auto update preferences</p>
-<center><img src="img/pk-progress.png" alt="[img]"/></center>
+<center><img src="img/gpk-progress.png" alt="[img]"/></center>
<p class="caption">Progress dialog</p>
-<center><img src="img/pk-added-deps.png" alt="[img]"/></center>
+<center><img src="img/gpk-added-deps.png" alt="[img]"/></center>
<p class="caption">Added check warning</p>
-<center><img src="img/pk-remove-confirm.png" alt="[img]"/></center>
+<center><img src="img/gpk-remove-confirm.png" alt="[img]"/></center>
<p class="caption">Remove check warning</p>
-<center><img src="img/pk-repo-auth.png" alt="[img]"/></center>
+<center><img src="img/gpk-repo-auth.png" alt="[img]"/></center>
<p class="caption">Repository authentication</p>
-<center><img src="img/pk-repo.png" alt="[img]"/></center>
+<center><img src="img/gpk-repo.png" alt="[img]"/></center>
<p class="caption">Repository viewer</p>
-<center><img src="img/pk-backend-status.png" alt="[img]"/></center>
+<center><img src="img/gpk-backend-status.png" alt="[img]"/></center>
<p class="caption">PackageKit backend status</p>
-<center><img src="img/pk-updates-warning.png" alt="[img]"/></center>
+<center><img src="img/gpk-updates-warning.png" alt="[img]"/></center>
<p class="caption">Libnotify updates warning</p>
-<center><img src="img/pk-waiting.png" alt="[img]"/></center>
+<center><img src="img/gpk-waiting.png" alt="[img]"/></center>
<p class="caption">Tasks waiting</p>
-<center><img src="img/pk-battery.png" alt="[img]"/></center>
+<center><img src="img/gpk-battery.png" alt="[img]"/></center>
<p class="caption">Intergration with gnome-power-manager</p>
-<center><img src="img/pk-inhibit.png" alt="[img]"/></center>
+<center><img src="img/gpk-inhibit.png" alt="[img]"/></center>
<p class="caption">Inhibit with gnome-power-manager</p>
-<center><img src="img/pk-require-restart.png" alt="[img]"/></center>
+<center><img src="img/gpk-require-restart.png" alt="[img]"/></center>
<p class="caption">We sometimes need to do a restart</p>
-<center><img src="img/pk-auto-update.png" alt="[img]"/></center>
+<center><img src="img/gpk-auto-update.png" alt="[img]"/></center>
<p class="caption">Auto update install dialog</p>
<p>Back to the <a href="index.html">main page</a></p>
commit e7462c4f01ea010d6fc42e919682fee48f0d9355
Merge: 958087a... 32707c6...
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Apr 17 14:56:23 2008 +0100
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit 958087a7b454da2b8198245c71b24ade9dd5656d
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Apr 17 14:56:02 2008 +0100
yum: improve the BASENAME filter by preferably matching against a non -devel and -debuginfo package
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index c462242..1ab0cc8 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -1108,6 +1108,15 @@ class PackageKitYumBackend(PackageKitBaseBackend):
else:
return INFO_UNKNOWN
+ def _is_main_package(self, repo):
+ if repo.endswith('-debuginfo'):
+ return False
+ if repo.endswith('-devel'):
+ return False
+ if repo.endswith('-libs'):
+ return False
+ return True
+
def _basename_filter(self, package_list):
'''
Filter the list so that the number of packages are reduced.
@@ -1137,7 +1146,14 @@ class PackageKitYumBackend(PackageKitBaseBackend):
output_list.append((pkg,status))
base_list_already_got.append ((base,version))
- #for all the already added output lists, remove the same basename from base_list
+ #for all the ones not yet got, can we match against a non devel match?
+ for (pkg,status,base,version) in base_list:
+ if (base,version) not in base_list_already_got:
+ if self._is_main_package(pkg.name):
+ output_list.append((pkg,status))
+ base_list_already_got.append ((base,version))
+
+ #add the remainder of the packages, which should just be the single debuginfo's
for (pkg,status,base,version) in base_list:
if (base,version) not in base_list_already_got:
output_list.append((pkg,status))
commit 32707c6e644dc966eb78ef47e235579137facf23
Author: Stefan Haas <shaas at suse.de>
Date: Thu Apr 17 15:36:00 2008 +0200
look for the right arch
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index 0c6c3ed..747decc 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -562,11 +562,15 @@ backend_get_description_thread (PkBackendThread *thread, gpointer data)
zypp::sat::Solvable package;
for (std::vector<zypp::sat::Solvable>::iterator it = v->begin ();
it != v->end (); it++) {
- const char *version = it->edition ().asString ().c_str ();
- if (strcmp (pi->version, version) == 0) {
+ gchar *version = g_strdup (it->edition ().asString ().c_str ());
+ gchar *arch = g_strdup (it->arch ().c_str ());
+
+ if (strcmp (pi->version, version) == 0 && strcmp (pi->arch, arch) == 0) {
package = *it;
break;
}
+ g_free (version);
+ g_free (arch);
}
delete (v);
@@ -590,7 +594,7 @@ backend_get_description_thread (PkBackendThread *thread, gpointer data)
d->package_id, // package_id
rpmHeader->tag_license ().c_str (), // const gchar *license
group, // PkGroupEnum group
- rpmHeader->tag_description ().c_str (), // const gchar *description
+ package.lookupStrAttribute (zypp::sat::SolvAttr::description).c_str (), //pkg->description ().c_str (),
rpmHeader->tag_url (). c_str (), // const gchar *url
(gulong)rpmHeader->tag_archivesize ()); // gulong size
More information about the PackageKit-commit
mailing list