Couple of minor fixes (#9134)

* Couple of minor fixes * add fail case
AzureSDKAutomation · Mar 17, 2020 · 36231cf · 36231cf
1 parent 06da9fe
commit 36231cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/eng/versioning/pom_file_version_scanner.ps1 b/eng/versioning/pom_file_version_scanner.ps1
@@ -111,14 +111,14 @@ function Build-Dependency-Hash-From-File {
                 [Dependency]$dep = [Dependency]::new($line)
                 if ($depHash.ContainsKey($dep.id))
                 {
-                    Write-Error "Error: Duplicate dependency encountered. '$($dep.id)' defined in '$($depFile)' already exists in the dependency list which means it is defined in multiple version_*.txt files."
+                    Write-Error-With-Color "Error: Duplicate dependency encountered. '$($dep.id)' defined in '$($depFile)' already exists in the dependency list which means it is defined in multiple version_*.txt files."
                     $script:FoundError = $true
                     continue
                 }
                 $depHash.Add($dep.id, $dep)
             }
             catch {
-                Write-Error "Invalid dependency line='$($line) in file=$($depFile)"
+                Write-Error-With-Color "Invalid dependency line='$($line) in file=$($depFile)"
             }
         } 
         else 
@@ -127,14 +127,14 @@ function Build-Dependency-Hash-From-File {
                 [ExternalDependency]$dep = [ExternalDependency]::new($line)
                 if ($depHash.ContainsKey($dep.id))
                 {
-                    Write-Error "Error: Duplicate external_dependency encountered. '$($dep.id)' has a duplicate entry defined in '$($depFile)'. Please ensure that all entries are unique."
+                    Write-Error-With-Color "Error: Duplicate external_dependency encountered. '$($dep.id)' has a duplicate entry defined in '$($depFile)'. Please ensure that all entries are unique."
                     $script:FoundError = $true
                     continue
                 }
                 $depHash.Add($dep.id, $dep)
             }
             catch {
-                Write-Error "Invalid external dependency line='$($line) in file=$($depFile)"
+                Write-Error-With-Color "Invalid external dependency line='$($line) in file=$($depFile)"
             }
         }
     }
@@ -261,6 +261,7 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
     Write-Host "processing pomFile=$($pomFile)"
     if ($xmlPomFile.project.dependencyManagement)
     {
+        $script:FoundError = $true
         Write-Error-With-Color "Error: <dependencyManagement> is not allowed. Every dependency must have its own version and version update tag"
     }
 

diff --git a/eng/versioning/update_versions.py b/eng/versioning/update_versions.py
@@ -169,6 +169,8 @@ def load_version_map_from_file(the_file, version_map):
             if not stripped_line or stripped_line.startswith('#'):
                 continue
             module = CodeModule(stripped_line)
+            if (module.name in version_map):
+                raise ValueError('Version file: {0} contains a duplicate entry: {1}'.format(the_file, module.name)) 
             version_map[module.name] = module
 
 def display_version_info(version_map):