From 98066ab241aa996d34c2982c7901532a8e4a8007 Mon Sep 17 00:00:00 2001
From: Emmanuel Venisse <evenisse@apache.org>
Date: Thu, 4 Aug 2005 06:30:13 +0000
Subject: [PATCH] Allowed user to defined maven.repo.local if settings.xml file
 exist

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227310 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-mboot2/src/main/java/MBoot.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java
index eff2523611..7bd5722b33 100644
--- a/maven-mboot2/src/main/java/MBoot.java
+++ b/maven-mboot2/src/main/java/MBoot.java
@@ -153,7 +153,11 @@ public class MBoot
         {
             userModelReader.parse( settingsXml );
 
-            mavenRepoLocal = userModelReader.getLocalRepository();
+            if ( mavenRepoLocal != null )
+            {
+                // user don't override mavenRepoLocal with maven.repo.local system property
+                mavenRepoLocal = userModelReader.getLocalRepository();
+            }
         }
 
         if ( mavenRepoLocal == null )