fink/perlmod/Fink PkgVersion.pm,1.262.2.3,1.262.2.4 Services.pm,1.112.2.1,1.112.2.2 Status.pm,1.15.6.1,1.15.6.2 VirtPackage.pm,1.40.2.4,1.40.2.5

[Benjamin Reed]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1290

Modified Files:
      Tag: virt_always_exists
        PkgVersion.pm Services.pm Status.pm VirtPackage.pm 
Log Message:
undef, for overloaded args

Index: VirtPackage.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v
retrieving revision 1.40.2.4
retrieving revision 1.40.2.5
diff -u -d -r1.40.2.4 -r1.40.2.5
--- VirtPackage.pm      8 Jul 2004 03:50:33 -0000       1.40.2.4
+++ VirtPackage.pm      9 Jul 2004 03:12:11 -0000       1.40.2.5
@@ -653,7 +653,7 @@
                my ($purge, $ok, $installstat) = split(/\s+/, 
$self->{$pkgname}->{status});
                return $self->{$pkgname}->{version} if ($installstat eq "installed" 
and exists $self->{$pkgname}->{version});
        }
-       return;
+       return undef;
 }
 
 
@@ -693,17 +693,6 @@
        return $list;
 }
 
-### query whether a package is installed
-# returns true/false
-sub is_installed {
-       my $self = shift;
-       my $pkgname = shift;
-
-       if (exists $self->{$pkgname} and exists $self->{$pkgname}->{status} and 
$self->{$pkgname}->{status} =~ / installed$/) {
-               return 1;
-       }
-       return;
-}
 
 sub has_header {
        my $headername = shift;

Index: Status.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Status.pm,v
retrieving revision 1.15.6.1
retrieving revision 1.15.6.2
diff -u -d -r1.15.6.1 -r1.15.6.2
--- Status.pm   7 Jul 2004 19:35:51 -0000       1.15.6.1
+++ Status.pm   9 Jul 2004 03:12:11 -0000       1.15.6.2
@@ -153,7 +153,7 @@
        if (exists $self->{$pkgname} and $self->{$pkgname}->{status} =~ 
/\s+installed$/i) {
                return $self->{$pkgname}->{version};
        }
-       return;
+       return undef;
 }
 
 ### retrieve whole list with versions

Index: Services.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.112.2.1
retrieving revision 1.112.2.2
diff -u -d -r1.112.2.1 -r1.112.2.2
--- Services.pm 7 Jul 2004 19:35:51 -0000       1.112.2.1
+++ Services.pm 9 Jul 2004 03:12:11 -0000       1.112.2.2
@@ -634,7 +634,7 @@
        $op = shift;
        $b = shift;
 
-       return if (not defined $a or not defined $op or not defined $b);
+       return undef if (not defined $a or not defined $op or not defined $b);
 
        if (exists($Version_Cmp_Cache{$a}{$b})) {
                $res = $Version_Cmp_Cache{$a}{$b};

Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.262.2.3
retrieving revision 1.262.2.4
diff -u -d -r1.262.2.3 -r1.262.2.4
--- PkgVersion.pm       9 Jul 2004 03:01:43 -0000       1.262.2.3
+++ PkgVersion.pm       9 Jul 2004 03:12:11 -0000       1.262.2.4
@@ -958,7 +958,7 @@
        my $self = shift;
 
        if ((&version_cmp(Fink::Status->query_package($self->{_name}), '=', 
$self->get_fullversion())) or
-          (version_cmp(Fink::VirtPackage->query_package($self->{_name}), '=', 
$self->get_fullversion()))) {
+          (&version_cmp(Fink::VirtPackage->query_package($self->{_name}), '=', 
$self->get_fullversion()))) {
                return 1;
        }
        return 0;



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits