Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2560/perlmod/Fink
Modified Files:
ChangeLog Services.pm
Log Message:
allow apt-get/dpkg not it %p/bin
Index: Services.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- Services.pm 27 Apr 2005 18:30:28 -0000 1.161
+++ Services.pm 28 Apr 2005 03:25:32 -0000 1.162
@@ -1562,10 +1562,10 @@
=cut
sub dpkg_lockwait {
- require Fink::Config;
- my $path = "$Fink::Config::basepath/bin/dpkg-lockwait";
- return $path if -x $path;
- return "$Fink::Config::basepath/bin/dpkg";
+ my $name = "dpkg";
+ return ((grep { -f "$_/$name-lockwait" && -x _ } split /:/, $ENV{PATH})
+ ? "$name-lockwait"
+ : $name);
}
=item aptget_lockwait
@@ -1577,10 +1577,10 @@
=cut
sub aptget_lockwait {
- require Fink::Config;
- my $path = "$Fink::Config::basepath/bin/apt-get-lockwait";
- return $path if -x $path;
- return "$Fink::Config::basepath/bin/apt-get";
+ my $name = "apt-get";
+ return ((grep { -f "$_/$name-lockwait" && -x _ } split /:/, $ENV{PATH})
+ ? "$name-lockwait"
+ : $name);
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -d -r1.982 -r1.983
--- ChangeLog 28 Apr 2005 01:19:07 -0000 1.982
+++ ChangeLog 28 Apr 2005 03:25:31 -0000 1.983
@@ -1,3 +1,7 @@
+2005-04-27 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * Services.pm: Don't restrict dpkg/apt-get to %p/bin.
+
2005-04-27 Daniel Macks <[EMAIL PROTECTED]>
* Package.pm: Typo in cache param.
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
