Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27153
Modified Files:
Tag: branch_0_29
ChangeLog Engine.pm
Log Message:
backport fix for cleanup_debs for x86_64 arch
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.431.2.3
retrieving revision 1.431.2.4
diff -u -d -r1.431.2.3 -r1.431.2.4
--- Engine.pm 10 Aug 2009 18:29:13 -0000 1.431.2.3
+++ Engine.pm 1 Nov 2009 07:29:33 -0000 1.431.2.4
@@ -1248,6 +1248,7 @@
my %opts = (dryrun => 0, @_);
return if $config->mixed_arch(message=>'cleanup .deb archives');
+ my $debarch = $config->param('Debarch');
Fink::Package->require_packages();
@@ -1259,8 +1260,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.1592.2.33
retrieving revision 1.1592.2.34
diff -u -d -r1.1592.2.33 -r1.1592.2.34
--- ChangeLog 18 Oct 2009 22:26:30 -0000 1.1592.2.33
+++ ChangeLog 1 Nov 2009 07:29:33 -0000 1.1592.2.34
@@ -1,3 +1,8 @@
+2009-11-01 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
