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

Modified Files:
        ChangeLog Engine.pm 
Log Message:
* PkgVersion.pm: Don't rebuild .deb that just were downloaded if
  UseBinaryDist is active. Fixes bug #1518461


Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -d -r1.380 -r1.381
--- Engine.pm   12 Sep 2006 20:35:53 -0000      1.380
+++ Engine.pm   15 Sep 2006 15:54:42 -0000      1.381
@@ -1671,8 +1671,9 @@
                } elsif ($item->[FLAG] == 1) {
                        push @requested, $pkgname;
                }
-               if ($item->[OP] == $OP_REBUILD || $item->[OP] == $OP_BUILD || 
not $item->[PKGVER]->is_present()) {
-                       unless ($item->[OP] == $OP_INSTALL and 
$item->[PKGVER]->is_installed()) {
+               if ($item->[OP] == $OP_REBUILD || $item->[OP] == $OP_BUILD || 
+                   (not $item->[PKGVER]->is_present() and 
not($deb_from_binary_dist and $item->[PKGVER]->is_aptgetable()))) {
+                       unless (($item->[OP] == $OP_INSTALL and 
$item->[PKGVER]->is_installed())) {
                                $willbuild = 1;
                                $to_be_rebuilt{$pkgname} = 1;
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1376
retrieving revision 1.1377
diff -u -d -r1.1376 -r1.1377
--- ChangeLog   13 Sep 2006 17:46:22 -0000      1.1376
+++ ChangeLog   15 Sep 2006 15:54:41 -0000      1.1377
@@ -1,3 +1,8 @@
+2006-09-15  Christian Schaffner  <[EMAIL PROTECTED]>
+
+       * PkgVersion.pm: Don't rebuild .deb that just were downloaded if
+         UseBinaryDist is active. Fixes bug #1518461
+
 2006-09-13  Matthew Sachs  <[EMAIL PROTECTED]>
 
        * Validation.pm: Fix validation for InfoTest-less packages.


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to