Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1192
Modified Files:
ChangeLog fink-virtual-pkgs.in
Log Message:
virtual packages always exist
Index: fink-virtual-pkgs.in
===================================================================
RCS file: /cvsroot/fink/fink/fink-virtual-pkgs.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fink-virtual-pkgs.in 14 Feb 2004 15:22:13 -0000 1.10
+++ fink-virtual-pkgs.in 16 Jul 2004 20:55:26 -0000 1.11
@@ -54,7 +54,7 @@
}
$epoch=0;
if ($options{dpkg}) {
- if (@versions = parse_fullversion($hash->{version})) {
+ if (@versions = parse_fullversion($hash->{version}) and exists
$hash->{status} and $hash->{status} =~ /^\S+\s+ok\s+installed$/i) {
printf
"%s\t%lu\t%s\t%s\n",$hash->{package},$versions[0],$versions[1],$versions[2];
# for provides we tell dpkg about them with the
version as zero
if (exists $hash->{provides})
@@ -67,7 +67,7 @@
}
}
} else {
- printf "Package: %s\nStatus: install ok installed\nVersion:
%s\n", $hash->{package},$hash->{version};
+ printf "Package: %s\nStatus: %s\nVersion: %s\n",
$hash->{package},$hash->{status},$hash->{version};
foreach $field (keys %$hash)
{
next if (($field eq "package") or ($field eq "status")
or ($field eq "version"));
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- ChangeLog 6 Jul 2004 20:14:28 -0000 1.238
+++ ChangeLog 16 Jul 2004 20:55:26 -0000 1.239
@@ -1,3 +1,9 @@
+2004-07-16 Daniel Macks <[EMAIL PROTECTED]>
+
+ * fink-virtual-pkgs.in: Changed apt mode to respect "status"
+ (parallel to that method in Status.pm) instead of assuming
+ presence of package entry is equivalent to it being installed.
+
2004-07-06 Dave Morrison <[EMAIL PROTECTED]>
* VERSION: Bumped package manager version to 0.20.6, a release
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
