Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 84294 invoked from network); 24 Feb 2009 18:18:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Feb 2009 18:18:59 -0000 Received: (qmail 98070 invoked by uid 500); 24 Feb 2009 18:18:58 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 98025 invoked by uid 500); 24 Feb 2009 18:18:58 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 98015 invoked by uid 99); 24 Feb 2009 18:18:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2009 10:18:58 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2009 18:18:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3FC232388882; Tue, 24 Feb 2009 18:18:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r747468 - /maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Date: Tue, 24 Feb 2009 18:18:31 -0000 To: commits@maven.apache.org From: jdcasey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090224181831.3FC232388882@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdcasey Date: Tue Feb 24 18:18:30 2009 New Revision: 747468 URL: http://svn.apache.org/viewvc?rev=747468&view=rev Log: REOPENED - issue MNG-3139: The skin does not exist: Unable to determine the release version http://jira.codehaus.org/browse/MNG-3139 Applied patch. This prevents re-checking the blacklist when merging metadata files on the local filesystem, since it's possible that those files have changed outside of this runtime. Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=747468&r1=747467&r2=747468&view=diff ============================================================================== --- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original) +++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Tue Feb 24 18:18:30 2009 @@ -195,8 +195,7 @@ ArtifactRepositoryPolicy policy = metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases(); - if ( ( policy.isEnabled() && !repository.isBlacklisted() ) - && ( loadMetadata( metadata, repository, localRepository, previousMetadata ) ) ) + if ( policy.isEnabled() && loadMetadata( metadata, repository, localRepository, previousMetadata ) ) { metadata.setRepository( repository ); selected = repository;