[PackageKit-commit] packagekit: Branch 'master' - 20 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Tue Jun 10 08:11:49 PDT 2008
backends/alpm/pk-backend-alpm.c | 15 ++
backends/urpmi/helpers/Makefile.am | 1
backends/urpmi/helpers/get-depends.pl | 12 --
backends/urpmi/helpers/get-requires.pl | 2
backends/urpmi/helpers/get-updates.pl | 17 ++
backends/urpmi/helpers/install-packages.pl | 8 -
backends/urpmi/helpers/remove-packages.pl | 16 --
backends/urpmi/helpers/update-packages.pl | 7 -
backends/urpmi/helpers/update-system.pl | 24 ++++
backends/urpmi/helpers/urpmi_backend/actions.pm | 12 +-
backends/urpmi/pk-backend-urpmi.c | 11 +
contrib/gnome-packagekit.catalog | 17 --
contrib/gnome-packagekit.spec.in | 143 ------------------------
docs/html/img/author-alefebvre.png |binary
docs/html/pk-authors.html | 4
docs/html/pk-matrix.html | 8 -
docs/html/pk-screenshots.html | 3
libpackagekit/pk-client.c | 2
po/POTFILES.in | 5
19 files changed, 95 insertions(+), 212 deletions(-)
New commits:
commit 5340742fc26fa66e915d0bdc3a3462569af95f3c
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jun 10 16:10:08 2008 +0100
trivial: add a screenshot of the run launcher
diff --git a/docs/html/pk-screenshots.html b/docs/html/pk-screenshots.html
index 5c7d4fa..0a75817 100644
--- a/docs/html/pk-screenshots.html
+++ b/docs/html/pk-screenshots.html
@@ -53,6 +53,9 @@
<center><img src="img/gpk-eula.png" alt=""/></center>
<p class="caption">EULA dialog</p>
+<center><img src="img/gpk-run-application.png" alt=""/></center>
+<p class="caption">Post-install asking if applications should be run</p>
+
<center><img src="img/gpk-remove-confirm.png" alt=""/></center>
<p class="caption">Remove check warning</p>
commit 3d47486a9147db92477f50f60ddedbddaef2e0f7
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Tue Jun 10 15:28:03 2008 +0200
Code cleaning in urpmi backend
diff --git a/backends/urpmi/helpers/get-depends.pl b/backends/urpmi/helpers/get-depends.pl
index bf936c5..3c5b60a 100755
--- a/backends/urpmi/helpers/get-depends.pl
+++ b/backends/urpmi/helpers/get-depends.pl
@@ -27,15 +27,9 @@ exit if($#ARGV != 2);
my @filters = split(/;/, $ARGV[0]);
my @pkgid = split(/;/, $ARGV[1]);
my $recursive_option = 0;
-$recursive_option = 1 if($ARGV[2] eq "yes");
-
-# Only recursive option is supported
-# So, if user set no tu recursive option,
-# backend will return error
-if(!$recursive_option) {
- printf("error\tnot-supported\tOnly recursive option to yes is supported\n");
- exit;
-}
+
+# We force the recursive option
+$recursive_option = 1;
pk_print_status(PK_STATUS_ENUM_DEP_RESOLVE);
diff --git a/backends/urpmi/helpers/get-requires.pl b/backends/urpmi/helpers/get-requires.pl
index 0012b2a..52853f8 100755
--- a/backends/urpmi/helpers/get-requires.pl
+++ b/backends/urpmi/helpers/get-requires.pl
@@ -36,7 +36,7 @@ if(!$pkg) {
pk_print_error(PK_ERROR_ENUM_PACKAGE_NOT_FOUND, "Requested package wasn't found");
exit;
}
-# print "Checking requires of the package : ", urpm_name($pkg), "\n";
+
pk_print_status(PK_STATUS_ENUM_DEP_RESOLVE);
my @requires = perform_requires_search($urpm, $pkg, $recursive_option);
diff --git a/backends/urpmi/helpers/remove-packages.pl b/backends/urpmi/helpers/remove-packages.pl
index 6cca6a7..d17b3d1 100755
--- a/backends/urpmi/helpers/remove-packages.pl
+++ b/backends/urpmi/helpers/remove-packages.pl
@@ -56,28 +56,21 @@ my @to_remove = urpm::select::find_packages_to_remove($urpm,
);
if($notfound) {
- # printf("Error: package %s not found\n", $pkgid[0]);
pk_print_error(PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, "Selected package isn't installed on your system");
}
elsif(@breaking_pkgs) {
- # printf("Error: These packages will break your system = \n\t%s\n", join("\n\t", @breaking_pkgs));
pk_print_error(PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE, "Removing selected packages will break your system");
}
else {
- # printf("It's ok, I will remove %s NOW !\n", $pkgid[0]);
- # printf("To remove list = \n\t%s\n", join("\n\t", @to_remove));
if(!$allowdeps_option && $#to_remove > 1) {
pk_print_error(PK_ERROR_ENUM_TRANSACTION_ERROR, "Packages can't be removed because dependencies remove is forbidden");
- # printf("I can't remove, because you don't allow deps remove :'(\n");
}
else {
- # printf("Let's go for removing ...\n");
pk_print_status(PK_STATUS_ENUM_REMOVE);
urpm::install::install($urpm,
\@to_remove, {}, {},
callback_report_uninst => sub {
my @return = split(/ /, $_[0]);
- # printf("Package\tRemoving\t%s\n", fullname_to_package_id($return[$#return]));
pk_print_package(INFO_REMOVING, fullname_to_package_id($return[$#return]), "");
}
);
diff --git a/backends/urpmi/helpers/urpmi_backend/actions.pm b/backends/urpmi/helpers/urpmi_backend/actions.pm
index a01b893..966b472 100644
--- a/backends/urpmi/helpers/urpmi_backend/actions.pm
+++ b/backends/urpmi/helpers/urpmi_backend/actions.pm
@@ -16,9 +16,9 @@ use perl_packagekit::prints;
use Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(
- perform_installation
- perform_file_search
- perform_requires_search
+perform_installation
+perform_file_search
+perform_requires_search
);
sub perform_installation {
@@ -111,11 +111,11 @@ sub perform_installation {
if ($subtype eq 'start') {
if ($type eq 'trans') {
print "Preparing packages installation ...\n";
- pk_print_status(PK_STATUS_ENUM_INSTALL);
+ pk_print_status(PK_STATUS_ENUM_INSTALL);
}
elsif (defined $pkg) {
printf("Installing package %s ...\n", $pkg->name);
- pk_print_package(INFO_INSTALLING, get_package_id($pkg), $pkg->summary);
+ pk_print_package(INFO_INSTALLING, get_package_id($pkg), $pkg->summary);
}
}
elsif ($subtype eq 'progress') {
@@ -157,7 +157,7 @@ sub perform_installation {
completed => sub {
undef $lock;
undef $rpm_lock;
- pk_print_status(PK_STATUS_ENUM_FINISHED);
+ pk_print_status(PK_STATUS_ENUM_FINISHED);
},
post_download => sub {
# Fix me !
commit c3ea9359acb3c1e7f798a61d5d7671b9ba291afa
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Tue Jun 10 14:30:40 2008 +0200
Cleaning
diff --git a/backends/urpmi/helpers/get-updates.pl b/backends/urpmi/helpers/get-updates.pl
index fb2973d..6730723 100755
--- a/backends/urpmi/helpers/get-updates.pl
+++ b/backends/urpmi/helpers/get-updates.pl
@@ -39,19 +39,15 @@ my ($src, $binary) = partition { $_->arch eq 'src' } @to_install;
@to_install = @$binary;
my $updates_descr = urpm::get_updates_description($urpm);
-
foreach(@to_install) {
- # Fix me
- # Be default, we set to bugfix info type
- # Need to be implemented, see urpmq source.
- my $updesc = $updates_descr->{URPM::pkg2media($urpm->{media}, $_)->{name}}{$_->name};
- if($updesc->{importance} eq "bugfix") {
- pk_print_package(INFO_BUGFIX, get_package_id($_), $_->summary);
- }
- elsif($updesc->{importance} eq "security") {
- pk_print_package(INFO_SECURITY, get_package_id($_), $_->summary);
- }
- else {
- pk_print_package(INFO_NORMAL, get_package_id($_), $_->summary);
- }
+ my $updesc = $updates_descr->{URPM::pkg2media($urpm->{media}, $_)->{name}}{$_->name};
+ if($updesc->{importance} eq "bugfix") {
+ pk_print_package(INFO_BUGFIX, get_package_id($_), $_->summary);
+ }
+ elsif($updesc->{importance} eq "security") {
+ pk_print_package(INFO_SECURITY, get_package_id($_), $_->summary);
+ }
+ else {
+ pk_print_package(INFO_NORMAL, get_package_id($_), $_->summary);
+ }
}
commit 655f032be72d3238c584031e9745935ccca689aa
Merge: 4165393... 7de9cd3...
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Tue Jun 10 14:28:42 2008 +0200
Merge branch 'master' of git+ssh://alk@git.packagekit.org/srv/git/PackageKit
commit 41653930d778d0c07fd27d66b00fa12e91c9cd63
Author: Aurelien Lefebvre <alefebvre at localhost.(none)>
Date: Tue Jun 10 14:25:14 2008 +0200
get-updates.pl of the urpmi backend now take care of update importance
diff --git a/backends/urpmi/helpers/get-updates.pl b/backends/urpmi/helpers/get-updates.pl
index 02d574c..fb2973d 100755
--- a/backends/urpmi/helpers/get-updates.pl
+++ b/backends/urpmi/helpers/get-updates.pl
@@ -37,10 +37,21 @@ my @to_remove = urpm::select::removed_packages($urpm, $state);
my @to_install = @{$urpm->{depslist}}[sort { $a <=> $b } keys %{$state->{selected}}];
my ($src, $binary) = partition { $_->arch eq 'src' } @to_install;
@to_install = @$binary;
+my $updates_descr = urpm::get_updates_description($urpm);
+
foreach(@to_install) {
- # Fix me
- # Be default, we set to bugfix info type
- # Need to be implemented, see urpmq source.
- pk_print_package(INFO_BUGFIX, get_package_id($_), $_->summary);
+ # Fix me
+ # Be default, we set to bugfix info type
+ # Need to be implemented, see urpmq source.
+ my $updesc = $updates_descr->{URPM::pkg2media($urpm->{media}, $_)->{name}}{$_->name};
+ if($updesc->{importance} eq "bugfix") {
+ pk_print_package(INFO_BUGFIX, get_package_id($_), $_->summary);
+ }
+ elsif($updesc->{importance} eq "security") {
+ pk_print_package(INFO_SECURITY, get_package_id($_), $_->summary);
+ }
+ else {
+ pk_print_package(INFO_NORMAL, get_package_id($_), $_->summary);
+ }
}
commit 7de9cd37bcf3f7a0342ac01e99bcc416d8abd6aa
Author: Valeriy Lyasotskiy <onestep at ukr.net>
Date: Tue Jun 10 13:17:07 2008 +0300
alpm: added backend_get_cancel
diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
index fd9041b..a61672e 100644
--- a/backends/alpm/pk-backend-alpm.c
+++ b/backends/alpm/pk-backend-alpm.c
@@ -117,11 +117,15 @@ cb_trans_evt (pmtransevt_t event, void *data1, void *data2)
switch (event) {
case PM_TRANS_EVT_REMOVE_START:
+ pk_backend_set_allow_cancel (backend_instance, FALSE);
+
package_id_str = pkg_to_package_id_str (data1, ALPM_LOCAL_DB_ALIAS);
pk_backend_package (backend_instance, PK_INFO_ENUM_REMOVING, package_id_str, alpm_pkg_get_desc (data1));
g_free (package_id_str);
break;
case PM_TRANS_EVT_ADD_START:
+ pk_backend_set_allow_cancel (backend_instance, FALSE);
+
pk_backend_set_status (backend_instance, PK_STATUS_ENUM_INSTALL);
package_id_needle = pkg_to_package_id_str (data1, "");
pk_debug ("needle is %s", package_id_needle);
@@ -876,6 +880,15 @@ backend_get_filters (PkBackend *backend)
}
/**
+ * backend_get_cancel:
+ **/
+static void
+backend_get_cancel (PkBackend *backend)
+{
+ pk_backend_set_status (backend, PK_STATUS_ENUM_CANCEL);
+}
+
+/**
* backend_get_details:
*/
static void
@@ -1412,7 +1425,7 @@ PK_BACKEND_OPTIONS (
backend_destroy, /* destroy */
backend_get_groups, /* get_groups */
backend_get_filters, /* get_filters */
- NULL, /* cancel */
+ backend_get_cancel, /* cancel */
NULL, /* get_depends */
backend_get_details, /* get_details */
backend_get_files, /* get_files */
commit 745c8face455cbdb6fd40ce96789f108f14c852d
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Tue Jun 10 11:48:14 2008 +0200
Update of my description of pk-authors page
diff --git a/docs/html/pk-authors.html b/docs/html/pk-authors.html
index 14e88eb..4e59527 100644
--- a/docs/html/pk-authors.html
+++ b/docs/html/pk-authors.html
@@ -269,7 +269,7 @@
<td>
<h2>Aurelien Lefebvre</h2>
<p>
- Aurelien works for <a href="http://www.mandriva.org">Mandriva</a>.
+ Aurelien is student at the University of Marne-la-Vallee (Paris Est), and half time working for <a href="http://www.mandriva.org">Mandriva</a>.
He works on the urpmi backend of PackageKit.
</p>
<p>
commit 386d1961d63b295e2567872258a2a597e8361cc1
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Tue Jun 10 10:48:49 2008 +0200
Photo updated
diff --git a/docs/html/img/author-alefebvre.png b/docs/html/img/author-alefebvre.png
index e7e2530..3c71b27 100644
Binary files a/docs/html/img/author-alefebvre.png and b/docs/html/img/author-alefebvre.png differ
commit de1c91d84da2fbd77f99fc28b7e953ae32ee64af
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Tue Jun 10 10:39:56 2008 +0200
Added my photo on pk-authors page
diff --git a/docs/html/img/author-alefebvre.png b/docs/html/img/author-alefebvre.png
new file mode 100644
index 0000000..e7e2530
Binary files /dev/null and b/docs/html/img/author-alefebvre.png differ
diff --git a/docs/html/pk-authors.html b/docs/html/pk-authors.html
index 7aa298b..14e88eb 100644
--- a/docs/html/pk-authors.html
+++ b/docs/html/pk-authors.html
@@ -264,7 +264,7 @@
<tr>
<td>
- <img src="img/author-unknown.png" alt=""/><!-- image should be 120px wide -->
+ <img src="img/author-alefebvre.png" alt=""/><!-- image should be 120px wide -->
</td>
<td>
<h2>Aurelien Lefebvre</h2>
commit 47aa83f2a75054ff935ab84421761ec52d763ce9
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Mon Jun 9 17:49:41 2008 +0200
pk-matrix updated for urpmi backend
diff --git a/docs/html/pk-matrix.html b/docs/html/pk-matrix.html
index 52b6132..53c9ff7 100644
--- a/docs/html/pk-matrix.html
+++ b/docs/html/pk-matrix.html
@@ -89,7 +89,7 @@
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- pisi -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- poldek -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- smart -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- urpmi -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- urpmi -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum2 -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- zypp -->
commit 9300da8af1b6335db1a82e0cc481e19d76c69534
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Mon Jun 9 17:08:41 2008 +0200
Added update-system implementation for the urpmi backend
diff --git a/backends/urpmi/helpers/Makefile.am b/backends/urpmi/helpers/Makefile.am
index 88f144e..6289fa5 100644
--- a/backends/urpmi/helpers/Makefile.am
+++ b/backends/urpmi/helpers/Makefile.am
@@ -21,6 +21,7 @@ dist_helper_DATA = \
search-file.pl \
resolve.pl \
update-packages.pl \
+ update-system.pl \
$(NULL)
install-data-hook:
diff --git a/backends/urpmi/helpers/update-system.pl b/backends/urpmi/helpers/update-system.pl
new file mode 100755
index 0000000..5089ae1
--- /dev/null
+++ b/backends/urpmi/helpers/update-system.pl
@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+
+use strict;
+
+use lib;
+use File::Basename;
+
+BEGIN {
+ push @INC, dirname($0);
+}
+
+use urpm;
+use urpm::media;
+use urpm::select;
+use urpm::args;
+use urpmi_backend::actions;
+
+# No arguments
+exit if($#ARGV != -1);
+
+my $urpm = urpm->new_parse_cmdline;
+urpm::media::configure($urpm);
+
+perform_installation($urpm, {}, auto_select => 1);
diff --git a/backends/urpmi/pk-backend-urpmi.c b/backends/urpmi/pk-backend-urpmi.c
index e7b56a7..9681def 100644
--- a/backends/urpmi/pk-backend-urpmi.c
+++ b/backends/urpmi/pk-backend-urpmi.c
@@ -317,6 +317,15 @@ backend_update_packages (PkBackend *backend, gchar **package_ids)
g_free (package_ids_temp);
}
+/**
+ * pk_backend_update_system:
+ */
+static void
+backend_update_system (PkBackend *backend)
+{
+ pk_backend_spawn_helper (spawn, "update-system.pl", NULL);
+}
+
PK_BACKEND_OPTIONS (
"URPMI", /* description */
@@ -349,7 +358,7 @@ PK_BACKEND_OPTIONS (
backend_search_name, /* search_name */
NULL, /* service_pack */
backend_update_packages, /* update_packages */
- NULL, /* update_system */
+ backend_update_system, /* update_system */
NULL /* what_provides */
);
commit 09ae4f93bd304c56fe9a1c3ca99eb15bb323ab7e
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Mon Jun 9 17:03:19 2008 +0200
pk-matrix updated for urpmi backend
diff --git a/docs/html/pk-matrix.html b/docs/html/pk-matrix.html
index 3b0fc37..52b6132 100644
--- a/docs/html/pk-matrix.html
+++ b/docs/html/pk-matrix.html
@@ -44,7 +44,7 @@
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- pisi -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- poldek -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- smart -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- urpmi -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- urpmi -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum2 -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- zypp -->
@@ -200,7 +200,7 @@
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- zypp -->
</tr>
<tr>
-<td><b>UpdatePackage</b></td>
+<td><b>UpdatePackages</b></td>
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- apt -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- alpm -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- box -->
@@ -209,7 +209,7 @@
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- pisi -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- poldek -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- smart -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- urpmi -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- urpmi -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum2 -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- zypp -->
commit 6a3e297f420ed3c6742c5720300724151892b9a8
Merge: 250bc73... 4a5b5af...
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Mon Jun 9 16:58:19 2008 +0200
Merge branch 'master' of git+ssh://alk@git.packagekit.org/srv/git/PackageKit
commit 250bc738f2238f4ce0c0467a22bb97012b7f9907
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Mon Jun 9 16:57:39 2008 +0200
bugfix: update-packages of the urpmi backend
diff --git a/backends/urpmi/helpers/update-packages.pl b/backends/urpmi/helpers/update-packages.pl
index 88274bc..838fec8 100755
--- a/backends/urpmi/helpers/update-packages.pl
+++ b/backends/urpmi/helpers/update-packages.pl
@@ -17,11 +17,12 @@ use urpmi_backend::tools;
use urpmi_backend::open_db;
use urpmi_backend::actions;
-# This script call only be called with one argument (the package id)
-exit if($#ARGV != 0);
+# This with one or more package ids
+exit if($#ARGV < 0);
my @names;
-foreach(split(/\|/, $ARGV[0])) {
+foreach(@ARGV) {
+ print "-->", $_, "<--", "\n";
my @pkgid = split(/;/, $_);
push @names, $pkgid[0];
}
commit 9d55f92d38bb5b84b76033e75544160d0c50b534
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Mon Jun 9 16:05:56 2008 +0200
bugfix: in remove-packages.pl
diff --git a/backends/urpmi/helpers/remove-packages.pl b/backends/urpmi/helpers/remove-packages.pl
index 3be38ea..6cca6a7 100755
--- a/backends/urpmi/helpers/remove-packages.pl
+++ b/backends/urpmi/helpers/remove-packages.pl
@@ -27,18 +27,17 @@ my $notfound_callback = sub {
$notfound = 1;
};
-# This script call only be called with two arguments (allow_deps (yes/no) and a package id)
-exit if($#ARGV != 1);
+# At least two arguments (allow deps & a package id list)
+exit if($#ARGV < 1);
my $urpm = urpm->new_parse_cmdline;
my $urpmi_lock = urpm::lock::urpmi_db($urpm, 'exclusive', wait => 1);
urpm::media::configure($urpm);
-$allowdeps_option = 1 if($ARGV[0] eq "yes");
+$allowdeps_option = shift @ARGV;
-my @pkg_ids = split(/\|/, pop @ARGV);
my @names;
-foreach(@pkg_ids) {
+foreach(@ARGV) {
my @pkg_id = (split(/;/, $_));
push @names, $pkg_id[0];
}
commit e556047ab31f13cd89197fcae2cbb68858039810
Author: Aurelien Lefebvre <alefebvre at mandriva.com>
Date: Mon Jun 9 15:10:52 2008 +0200
bugfix: with installation of more than on package at the same time
diff --git a/backends/urpmi/helpers/install-packages.pl b/backends/urpmi/helpers/install-packages.pl
index c9cf6c8..e8ddadf 100755
--- a/backends/urpmi/helpers/install-packages.pl
+++ b/backends/urpmi/helpers/install-packages.pl
@@ -16,17 +16,15 @@ use urpm::select;
use urpmi_backend::actions;
use urpmi_backend::tools;
-# One argument (package id)
-exit if($#ARGV != 0);
+# One or more arguments (Package ids)
+exit if($#ARGV < 0);
-my @pkg_ids = split(/\|/, pop @ARGV);
my @names;
-foreach(@pkg_ids) {
+foreach(@ARGV) {
my @pkg_id = (split(/;/, $_));
push @names, $pkg_id[0];
}
-
my $urpm = urpm->new_parse_cmdline;
urpm::media::configure($urpm);
commit 4a5b5afe901dee48554d27ad214799cb92ddaa53
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jun 9 11:09:27 2008 +0100
bugfix: make pk_client_get_package() actually work by using the corretc method name
diff --git a/libpackagekit/pk-client.c b/libpackagekit/pk-client.c
index 4bc34c9..e552a99 100644
--- a/libpackagekit/pk-client.c
+++ b/libpackagekit/pk-client.c
@@ -866,7 +866,7 @@ pk_client_get_package (PkClient *client, gchar **package, GError **error)
pk_client_error_set (error, PK_CLIENT_ERROR_NO_TID, "No proxy for transaction");
return FALSE;
}
- ret = dbus_g_proxy_call (client->priv->proxy, "GetPackage", error,
+ ret = dbus_g_proxy_call (client->priv->proxy, "GetPackageLast", error,
G_TYPE_INVALID,
G_TYPE_STRING, package,
G_TYPE_INVALID);
commit a70babf942dccc9050c8b00107f50689b8aad74c
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jun 9 11:02:41 2008 +0100
trivial: move the gnome-packagekit stuff to it's own source tree
diff --git a/contrib/gnome-packagekit.catalog b/contrib/gnome-packagekit.catalog
deleted file mode 100644
index 1fc53e7..0000000
--- a/contrib/gnome-packagekit.catalog
+++ /dev/null
@@ -1,17 +0,0 @@
-[PackageKit Catalog]
-
-# Common packages
-InstallPackages=autoconf;automake;intltool;libtool;pkgconfig
-
-# Fedora 9 does not have Unique
-InstallPackages(fedora-9)=PackageKit-devel;glib2-devel;gtk2-devel;libsexy-devel;libglade2-devel;libnotify-devel;PolicyKit-gnome-devel
-
-# Rawhide is fedora 9.90
-InstallPackages(fedora-9.90)=PackageKit-devel;glib2-devel;gtk2-devel;libsexy-devel;libglade2-devel;libnotify-devel;PolicyKit-gnome-devel;unique-devel
-
-# Pardus
-InstallPackages(pardus)=GConf2-devel;PackageKit-devel;PolicyKit-gnome-devel;dbus-devel;dbus-glib-devel;gettext-devel;gnome-doc-utils;gtk+2-devel;libglade2-devel;libnotify-devel;libsexy-devel
-
-# Forsight
-InstallPackages(forsight)=gnome-development;dbus-development
-
diff --git a/contrib/gnome-packagekit.spec.in b/contrib/gnome-packagekit.spec.in
deleted file mode 100644
index b3ddd45..0000000
--- a/contrib/gnome-packagekit.spec.in
+++ /dev/null
@@ -1,145 +0,0 @@
-%define dbus_version 0.61
-%define alphatag #ALPHATAG#
-%define _use_internal_dependency_generator 0
-
-Summary: GNOME PackageKit Client
-Name: gnome-packagekit
-Version: #VERSION#
-Release: 0.#BUILD#%{?alphatag}%{?dist}
-Epoch: 1
-License: GPLv2+
-Group: Applications/System
-URL: http://www.packagekit.org
-Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz
-Source1: system-install-packages
-Source2: system-install-packages.1.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gtk2 >= 2.12.0
-Requires: gnome-icon-theme
-Requires: libnotify >= 0.4.3
-Requires: unique >= 0.9.4
-Requires: dbus-glib >= %{dbus_version}
-Requires: dbus-x11 >= %{dbus_version}
-Requires: PackageKit >= %{packagekit_version}
-Requires: shared-mime-info
-Requires(post): scrollkeeper
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-Requires(postun): scrollkeeper
-Obsoletes: pirut < 1.3.30-3
-Provides: pirut = 1.3.30-3
-
-BuildRequires: libgnomeui-devel
-BuildRequires: libglade2-devel
-BuildRequires: libwnck-devel
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: libnotify-devel
-BuildRequires: gnome-panel-devel
-BuildRequires: scrollkeeper
-BuildRequires: gnome-doc-utils >= 0.3.2
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: libtool
-BuildRequires: cairo-devel
-BuildRequires: startup-notification-devel
-BuildRequires: perl(XML::Parser)
-BuildRequires: gnome-doc-utils
-BuildRequires: libsexy-devel
-BuildRequires: PackageKit-devel >= %{packagekit_version}
-BuildRequires: PolicyKit-gnome-devel
-BuildRequires: unique-devel
-
-%description
-packagekit-gnome provides session applications for the PackageKit API.
-There are several utilities designed for installing, updating and
-removing packages on your system.
-
-%prep
-%setup -q
-
-%build
-%configure --disable-scrollkeeper --disable-schemas-install
-make %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/system-install-packages
-install -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/man/man1/system-install-packages.1.gz
-
-desktop-file-install --delete-original \
- --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ \
- $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gpk-update-icon.desktop
-
-for i in gpk-application gpk-update-viewer gpk-install-file gpk-log gpk-prefs gpk-repo ; do
- desktop-file-install --delete-original \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
- $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
-done
-
-%find_lang %name
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/gnome-packagekit.schemas >/dev/null || :
-scrollkeeper-update -q
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
-update-desktop-database %{_datadir}/applications
-update-mime-database %{_datadir}/mime
-
-%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gnome-packagekit.schemas > /dev/null || :
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gnome-packagekit.schemas > /dev/null || :
-fi
-
-%postun
-scrollkeeper-update -q
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
-update-desktop-database %{_datadir}/applications
-update-mime-database %{_datadir}/mime
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_bindir}/gpk-*
-%{_bindir}/system-install-packages
-%{_datadir}/gnome-packagekit
-%{_datadir}/icons/hicolor/16x16/status/*.png
-%{_datadir}/icons/hicolor/22x22/status/*.png
-%{_datadir}/icons/hicolor/24x24/status/*.png
-%{_datadir}/icons/hicolor/48x48/status/*.png
-%{_datadir}/icons/hicolor/scalable/status/*.svg
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/man/man1/*.1.gz
-%{_datadir}/gnome/help/gnome-packagekit
-%{_datadir}/omf/gnome-packagekit
-%{_sysconfdir}/xdg/autostart/gpk-update-icon.desktop
-%{_datadir}/applications/gpk-*.desktop
-
-%changelog
-* #LONGDATE# Richard Hughes <richard at hughsie.com> #VERSION#-0.#BUILD##ALPHATAG#
-- Update from GIT
-
commit ce02c4ac67c56475056b39da5011c36224217408
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jun 9 11:01:14 2008 +0100
trivial: fix two requires in the sample gnome-packagekit spec file
diff --git a/contrib/gnome-packagekit.spec.in b/contrib/gnome-packagekit.spec.in
index 15a2afd..b3ddd45 100644
--- a/contrib/gnome-packagekit.spec.in
+++ b/contrib/gnome-packagekit.spec.in
@@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gtk2 >= 2.12.0
Requires: gnome-icon-theme
Requires: libnotify >= 0.4.3
+Requires: unique >= 0.9.4
Requires: dbus-glib >= %{dbus_version}
Requires: dbus-x11 >= %{dbus_version}
Requires: PackageKit >= %{packagekit_version}
@@ -47,6 +48,7 @@ BuildRequires: gnome-doc-utils
BuildRequires: libsexy-devel
BuildRequires: PackageKit-devel >= %{packagekit_version}
BuildRequires: PolicyKit-gnome-devel
+BuildRequires: unique-devel
%description
packagekit-gnome provides session applications for the PackageKit API.
commit 636c18798862c6d8559a67239de1707ccfc419ba
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jun 9 10:42:03 2008 +0100
trivial: add a file to POTFILES.in to fix make distcheck
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7633210..01dcc13 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,11 @@
[encoding: UTF-8]
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
-policy/org.freedesktop.packagekit.policy.in
client/pk-console.c
-client/pk-monitor.c
client/pk-import-desktop.c
client/pk-import-specspo.c
+client/pk-monitor.c
+data/packagekit-catalog.xml.in
+policy/org.freedesktop.packagekit.policy.in
src/pk-main.c
More information about the PackageKit-commit
mailing list