From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 7 Jun 2013 12:08:00 +0000 (+0000)
Subject: Fix package name extraction for packages with '.' in their name.
X-Git-Tag: argeo-slc-2.1.7~336
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=5f11ef7c32058c909e53ace2b29b84e4db6b214e;p=gpl%2Fargeo-slc.git

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 c87b40e6c..1b44dd494 100644
--- 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() {