Fix package name extraction for packages with '.' in their name.

git-svn-id: https://svn.argeo.org/slc/trunk@6334 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/YumListParser.java b/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/YumListParser.java
index c87b40e6cb467f422374ec310d6f272c1db5b06b..1b44dd494f9bca8227a120dd6292d7d36922c1be 100644 (file)
--- a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/YumListParser.java
+++ b/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/YumListParser.java
@@ -6,6 +6,7 @@ import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.apache.commons.logging.Log;
@@ -79,7 +80,9 @@ public class YumListParser implements RpmPackageSet {
        protected String extractRpmName(String line) {
                StringTokenizer st = new StringTokenizer(line, " \t");
                String packageName = st.nextToken();
-               return packageName.split("\\.")[0];
+               // consider the arch as an extension
+               return FilenameUtils.getBaseName(packageName);
+               //return packageName.split("\\.")[0];
        }
 
        public Set<String> getInstalled() {