mirror of https://github.com/apache/archiva.git
formatting only
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@885816 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
52bcd1b58b
commit
cfabf95ff6
|
@ -292,8 +292,7 @@ public class UploadAction
|
|||
try
|
||||
{
|
||||
Configuration config = configuration.getConfiguration();
|
||||
ManagedRepositoryConfiguration repoConfig =
|
||||
config.findManagedRepositoryById( repositoryId );
|
||||
ManagedRepositoryConfiguration repoConfig = config.findManagedRepositoryById( repositoryId );
|
||||
|
||||
ArtifactReference artifactReference = new ArtifactReference();
|
||||
artifactReference.setArtifactId( artifactId );
|
||||
|
@ -345,14 +344,16 @@ public class UploadAction
|
|||
filename = filename.replaceAll( "SNAPSHOT", timestamp + "-" + newBuildNumber );
|
||||
}
|
||||
|
||||
boolean fixChecksums = !( config.getRepositoryScanning().getKnownContentConsumers().contains( "create-missing-checksums" ) );
|
||||
boolean fixChecksums =
|
||||
!( config.getRepositoryScanning().getKnownContentConsumers().contains( "create-missing-checksums" ) );
|
||||
|
||||
try
|
||||
{
|
||||
File targetFile = new File( targetPath, filename );
|
||||
if ( targetFile.exists() && !VersionUtil.isSnapshot( version ) && repoConfig.isBlockRedeployments() )
|
||||
{
|
||||
addActionError( "Overwriting released artifacts in repository '" + repoConfig.getId() + "' is not allowed." );
|
||||
addActionError(
|
||||
"Overwriting released artifacts in repository '" + repoConfig.getId() + "' is not allowed." );
|
||||
return ERROR;
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue