Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20179
Modified Files:
ChangeLog Engine.pm
Log Message:
"x86_64" contains _ so cannot rely on 3-field _ delimitted filename for .deb
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -d -r1.437 -r1.438
--- Engine.pm 17 Jun 2009 16:14:13 -0000 1.437
+++ Engine.pm 31 Oct 2009 22:34:24 -0000 1.438
@@ -1243,6 +1243,7 @@
my %opts = (dryrun => 0, @_);
return if $config->mixed_arch(message=>'cleanup .deb archives');
+ my $debarch = $config->param('Debarch');
Fink::Package->require_packages();
@@ -1254,8 +1255,8 @@
my $kill_obsolete_debs = <<'EOFUNC';
sub {
# parse apart filename according to .deb spec
- my @atoms = split /_/, $_;
- if (@atoms == 3 and $atoms[-1] =~ /\.deb\z/) {
+ my @atoms = /^(.*)_(.*)_$debarch\.deb$/;
+ if (@atoms == 2) {
# check if that %n at that %v-%r exists
my $deb_in_database = 0;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1641
retrieving revision 1.1642
diff -u -d -r1.1641 -r1.1642
--- ChangeLog 18 Oct 2009 22:24:47 -0000 1.1641
+++ ChangeLog 31 Oct 2009 22:34:24 -0000 1.1642
@@ -1,3 +1,8 @@
+2009-10-31 Daniel Macks <[email protected]>
+
+ * Engine.pm: Fix cleanup_debs to use "current arch" in .deb
+ filename instead of _ delimiter.
+
2009-10-18 Augusto Devegili <[email protected]>
* PkgVersion.pm: Fix comment typos
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
