[PackageKit-commit] packagekit: Branch 'master' - 8 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Mon Mar 23 02:49:13 PDT 2009
backends/alpm/pk-backend-alpm.c | 5 ++---
backends/dummy/pk-backend-dummy.c | 34 ++++++++++++++++++++++++++++++----
backends/yum/yumBackend.py | 4 +++-
po/pa.po | 26 ++++++++++++++------------
4 files changed, 49 insertions(+), 20 deletions(-)
New commits:
commit b2b3d9437efacc2f54ef5f92c1475735e37d1ed2
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Mar 21 17:07:45 2009 +0000
dummy: trivial fix to make sure gtkhtml gets installed
diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index 37b0fcc..94d142a 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -937,6 +937,11 @@ backend_update_system_timeout (gpointer data)
"gtkhtml2;2.19.1-4.fc8;i386;fedora",
"An HTML widget for GTK+ 2.0");
_updated_gtkhtml = FALSE;
+ } else {
+ pk_backend_package (backend, PK_INFO_ENUM_INSTALLING,
+ "gtkhtml2;2.19.1-4.fc8;i386;fedora",
+ "An HTML widget for GTK+ 2.0");
+ _updated_gtkhtml = TRUE;
}
}
if (_progress_percentage == 40 && !_updated_powertop) {
commit cc85e753dbc58c1c1c3b6beb7185d461822f8cbb
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Mar 21 17:07:29 2009 +0000
yum: don't explode parsing the ChangeLog data when the name is not unicode formatted
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 3fe4234..bda3d60 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -2334,7 +2334,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
for change in changes:
gmtime = time.gmtime(change[0])
time_str = "%i-%i-%i" % (gmtime[0], gmtime[1], gmtime[2])
- changelog += _format_str('**' + time_str + '** ' + change[1] + '\n' + _to_unicode(change[2].replace("\t", " ")) + '\n\n')
+ changelog += _format_str('**' + time_str + '** ' + _to_unicode(change[1]) + '\n' + _to_unicode(change[2].replace("\t", " ")) + '\n\n')
cve_url = _format_list(urls['cve'])
bz_url = _format_list(urls['bugzilla'])
commit c5b27a04cd512acb44b4baf599c2ef19790e5abb
Merge: 17dd94a... ed7cb50...
Author: Valeriy Lyasotskiy <onestep at ukr.net>
Date: Fri Mar 20 20:56:52 2009 +0200
Merge branch 'master' of git+ssh://onestep_ua@git.packagekit.org/srv/git/PackageKit
commit ed7cb50c72156dcc552f6ce0dbb51ab045961f6e
Author: aalam <aalam at fedoraproject.org>
Date: Fri Mar 20 16:12:17 2009 +0000
Sending translation for Punjabi
diff --git a/po/pa.po b/po/pa.po
index c3cce84..33a256d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -3,24 +3,25 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Amanpreet Singh Alam <aalam at users.sf.net>, 2008, 2009.
+# A S Alam <aalam at users.sf.net>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: packagekit.master\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-03 11:42+0000\n"
-"PO-Revision-Date: 2009-03-04 06:37+0530\n"
-"Last-Translator: Amanpreet Singh Alam <aalam at users.sf.net>\n"
-"Language-Team: Punjabi <punjabi-users at lists.sf.net>\n"
+"PO-Revision-Date: 2009-03-20 21:29+0000\n"
+"Last-Translator: A S Alam <aalam at users.sf.net>\n"
+"Language-Team: Punjabi/Panjabi <punjab-l10n at list.sf.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: this is an atomic transaction
#: ../client/pk-console.c:234
msgid "Transaction"
-msgstr "ਸੰਚਾਰ"
+msgstr "ਟਰਾਂਸੈਕਸ਼ਨ"
#. TRANSLATORS: this is the time the transaction was started in system timezone
#: ../client/pk-console.c:236
@@ -86,12 +87,12 @@ msgstr "ਪà©à¨°à¨à¨¾à¨µà¨¿à¨¤ ਪੈਕੇਜ: ਕੋਈ ਨਹੀਂ"
#. TRANSLATORS: this is the distro, e.g. Fedora 10
#: ../client/pk-console.c:297
msgid "Distribution"
-msgstr "ਵੰਡ"
+msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ"
#. TRANSLATORS: this is type of update, stable or testing
#: ../client/pk-console.c:299
msgid "Type"
-msgstr "ਕਿਸਮ"
+msgstr "ਟਾਈਪ"
#. TRANSLATORS: this is any summary text describing the upgrade
#. TRANSLATORS: this is the summary of the group
@@ -102,7 +103,7 @@ msgstr "ਸੰਖੇਪ"
#. TRANSLATORS: this is the group category name
#: ../client/pk-console.c:313
msgid "Category"
-msgstr "ਸà©à¨°à©‡à¨£à©€"
+msgstr "ਕੈਟਾਗਰੀ"
#. TRANSLATORS: this is group identifier
#: ../client/pk-console.c:315
@@ -167,7 +168,7 @@ msgstr "ਮà©à©œ-ਚਾਲੂ"
#. TRANSLATORS: details about the update, any description of the update
#: ../client/pk-console.c:371
msgid "Update text"
-msgstr "ਅੱਪਡੇਟ ਪਾਠ"
+msgstr "ਅੱਪਡੇਟ ਟੈਕਸਟ"
#. TRANSLATORS: details about the update, the changelog for the package
#: ../client/pk-console.c:375
@@ -471,7 +472,7 @@ msgstr "ਲਾਈਸੈਂਸ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ।"
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
#: ../client/pk-console.c:1610
msgid "The daemon crashed mid-transaction!"
-msgstr "ਡੈਮਨ ਅਧੂਰੀ ਟਰਾਂਜ਼ਿਸ਼ਨ ਵਿੱਚ ਨਸ਼ਟ ਹੋ ਗਈ!"
+msgstr "ਡੈਮਨ ਅਧੂਰੀ ਟਰਾਂਸੈਕਸ਼ਨ ਕਰੈਸ਼ ਹੋ ਗਈ!"
#. TRANSLATORS: This is the header to the --help menu
#: ../client/pk-console.c:1663
@@ -772,7 +773,7 @@ msgstr "ਠੀਕ ਪੈਕੇਜ ਚà©à¨£à©‹ ਜੀ:"
#: ../client/pk-tools-common.c:162
#, c-format
msgid "Please enter a number from 1 to %i: "
-msgstr "1 ਤੋਂ %i ਤੱਕ ਨੰਬਰ ਦਿਓ ਜੀ:"
+msgstr "੧ ਤੋਂ %i ਤੱਕ ਨੰਬਰ ਦਿਓ ਜੀ:"
#. TRANSLATORS: we failed to find the package, this shouldn't happen
#: ../contrib/command-not-found/pk-command-not-found.c:361
@@ -945,7 +946,7 @@ msgstr "ਵਰਤਣ ਲਈ ਮà©à©±à¨– ਡਾਟਾਬੇਸ ਫਾਇਲ (ਜ
#: ../data/packagekit-catalog.xml.in.h:1
msgid "PackageKit Catalog"
-msgstr "ਪੈਕੇਜਕਿੱਟ ਸੂਚੀ"
+msgstr "ਪੈਕੇਜਕਿੱਟ ਕੈਟਾਲਾਗ"
#: ../data/packagekit-package-list.xml.in.h:1
msgid "PackageKit Package List"
@@ -1023,3 +1024,4 @@ msgstr "ਸਿਸਟਮ ਬੱਸ ਨਾਲ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਨਹੀਂ ਕà
msgid "Error trying to start: %s\n"
msgstr "ਸ਼à©à¨°à©‚ ਕਰਨ ਲਈ ਗਲਤੀ: %s\n"
+
commit 17dd94a15914a1222c7a06e51fa107b8152c7610
Merge: 92e3b9b... 2d34431...
Author: Valeriy Lyasotskiy <onestep at ukr.net>
Date: Fri Mar 20 16:53:35 2009 +0200
Merge branch 'master' of git+ssh://onestep_ua@git.packagekit.org/srv/git/PackageKit
commit 2d34431a78701dcc1252d6138e6b2784c4f1bf13
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Mar 19 18:25:24 2009 +0000
trivial: format the ChangeLog data a little nicer
diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index 602f4c5..37b0fcc 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -272,6 +272,26 @@ backend_get_update_detail_timeout (gpointer data)
guint len;
const gchar *package_id;
PkBackend *backend = (PkBackend *) data;
+ const gchar *changelog;
+
+ /* dummy */
+ changelog = "**Thu Mar 12 2009** Adam Jackson <ajax at redhat.com> 1.6.0-13\n"
+ "- xselinux-1.6.0-selinux-nlfd.patch: Acquire the netlink socket from selinux,\n"
+ " check it ourselves rather than having libselinux bang on it all the time.\n"
+ "\n"
+ "**Wed Mar 11 2009** Adam Jackson <ajax at redhat.com> 1.6.0-10\n"
+ "- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy\n"
+ " says to be an object manager.\n"
+ "\n"
+ "**Wed Mar 11 2009** Adam Jackson <ajax at redhat.com> 1.6.0-11\n"
+ "- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)\n"
+ " ACPI code.\n"
+ "\n"
+ "**Wed Mar 11 2009** Adam Jackson <ajax at redhat.com> 1.6.0-12\n"
+ "- Requires: pixman >= 0.14.0\n"
+ "\n"
+ "**Fri Mar 6 2009** Adam Jackson <ajax at redhat.com> 1.6.0-8\n"
+ "- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)\n";
/* each one has a different detail for testing */
len = g_strv_length (_package_ids);
@@ -283,7 +303,7 @@ backend_get_update_detail_timeout (gpointer data)
"http://www.distro-update.org/page?moo;Bugfix release for powertop",
"http://bgzilla.fd.org/result.php?#12344;Freedesktop Bugzilla #12344",
"", PK_RESTART_ENUM_NONE, "Update to newest upstream source",
- "", PK_UPDATE_STATE_ENUM_STABLE, "2008-07-31", NULL);
+ changelog, PK_UPDATE_STATE_ENUM_STABLE, "2008-07-31", NULL);
} else if (egg_strequal (package_id, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed")) {
pk_backend_update_detail (backend, package_id,
"kernel;2.6.22-0.104.rc3.git6.fc8;i386;installed"
@@ -297,7 +317,7 @@ backend_get_update_detail_timeout (gpointer data)
"Update to newest upstream version.\n"
"* This should fix many driver bugs when using nouveau\n"
" * This also introduces the new `frobnicator` driver for *vibrating* rabbit hardware.",
- "", PK_UPDATE_STATE_ENUM_UNSTABLE, "2008-06-28", NULL);
+ changelog, PK_UPDATE_STATE_ENUM_UNSTABLE, "2008-06-28", NULL);
} else if (egg_strequal (package_id, "gtkhtml2;2.19.1-4.fc8;i386;fedora")) {
pk_backend_update_detail (backend, package_id,
"gtkhtml2;2.18.1-22.fc8;i386;installed", "",
@@ -308,14 +328,14 @@ backend_get_update_detail_timeout (gpointer data)
"* support this new thing\n"
"* something else\n"
"- and that new thing",
- "", PK_UPDATE_STATE_ENUM_UNKNOWN, "2008-07-25", NULL);
+ changelog, PK_UPDATE_STATE_ENUM_UNKNOWN, "2008-07-25", NULL);
} else if (egg_strequal (package_id, "vino;2.24.2.fc9;i386;fedora")) {
pk_backend_update_detail (backend, package_id,
"vino;2.24.1.fc9;i386;fedora", "",
"", "", NULL, PK_RESTART_ENUM_NONE,
"Cannot get update as update conflics with vncviewer",
- "", PK_UPDATE_STATE_ENUM_UNKNOWN, "2008-07-25", NULL);
+ changelog, PK_UPDATE_STATE_ENUM_UNKNOWN, "2008-07-25", NULL);
} else {
/* signal to UI */
pk_backend_error_code (backend, PK_ERROR_ENUM_INTERNAL_ERROR, "the package update detail was not found for %s", package_id);
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 90f6c19..3fe4234 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -2332,7 +2332,9 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
if len(changelog) == 0:
changes = pkg.returnChangelog()
for change in changes:
- changelog += _format_str('**' + time.ctime(change[0]) + '** ' + change[1] + '\n' + _to_unicode(change[2].replace("\t", " ")) + '\n\n')
+ gmtime = time.gmtime(change[0])
+ time_str = "%i-%i-%i" % (gmtime[0], gmtime[1], gmtime[2])
+ changelog += _format_str('**' + time_str + '** ' + change[1] + '\n' + _to_unicode(change[2].replace("\t", " ")) + '\n\n')
cve_url = _format_list(urls['cve'])
bz_url = _format_list(urls['bugzilla'])
commit 0288da1c3c9851f75a34d10f189beecf1dbe89c7
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Mar 19 11:15:40 2009 +0000
dummy: do the restart required when we update packages too
diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index 408c04e..602f4c5 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -780,6 +780,7 @@ backend_update_packages_download_timeout (gpointer data)
"kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed",
"The Linux kernel (the core of the Linux operating system)");
pk_backend_set_sub_percentage (backend, 0);
+ pk_backend_require_restart (backend, PK_RESTART_ENUM_SYSTEM, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed");
}
if (_progress_percentage == 30 && !_updated_gtkhtml) {
pk_backend_message (backend, PK_MESSAGE_ENUM_NEWER_PACKAGE_EXISTS, "A newer package preupgrade is available in fedora-updates-testing");
commit 92e3b9be71caa3273978b74a73ba3d526ebd1930
Author: Valeriy Lyasotskiy <onestep at ukr.net>
Date: Fri Feb 20 01:10:47 2009 +0200
alpm: fixed a typo, that caused search failures
diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
index cd58432..4f4bd6e 100644
--- a/backends/alpm/pk-backend-alpm.c
+++ b/backends/alpm/pk-backend-alpm.c
@@ -93,7 +93,7 @@ pkg_from_package_id_str (const gchar *package_id_str)
alpm_list_t *iterator;
for (iterator = alpm_option_get_syncdbs (); iterator; iterator = alpm_list_next (iterator)) {
repo = alpm_list_getdata (iterator);
- if (egg_strequal (alpm_db_get_name (repo), pk_package_id_get_data (pkg_id)) == 0)
+ if (egg_strequal (alpm_db_get_name (repo), pk_package_id_get_data (pkg_id)))
break;
}
}
@@ -219,7 +219,6 @@ cb_trans_progress (pmtransprog_t event, const char *pkgname, int percent, int ho
int trans_percent;
egg_debug ("alpm: transaction percentage for %s is %i", pkgname, percent);
- egg_debug ("alpm: current is %i", current);
trans_percent = (int) ((float) ((current - 1) * 100 + percent)) / ((float) (howmany * 100)) * 100;
pk_backend_set_sub_percentage ((PkBackend *) backend_instance, percent);
pk_backend_set_percentage ((PkBackend *) backend_instance, trans_percent);
@@ -702,7 +701,7 @@ backend_cancel (PkBackend *backend)
}
/**
- * backend_download_packages:
+ * backend_download_packages_thread:
*/
static gboolean
backend_download_packages_thread (PkBackend *backend)
More information about the PackageKit-commit
mailing list