X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.rpmfactory%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frpmfactory%2Fcore%2FCreateRpmDistribution.java;h=625193aa924aaaf7b431b9c3aab259bcdeb3d44c;hb=e03b993a84bb39e3f146a0ef8782a09661239be7;hp=70a5e705c2a3601466059d260ad0de52bacb8ef5;hpb=3752fba0edf87a770b5763f5a4aab43c4a0a4e4e;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java b/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java
index 70a5e705c..625193aa9 100644
--- a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java
+++ b/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java
@@ -16,7 +16,6 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.tasks.SystemCall;
-import org.springframework.core.io.ByteArrayResource;
 
 /**
  * Gather RPMs from various sources (local builds or third party) into a
@@ -46,7 +45,7 @@ public class CreateRpmDistribution implements Runnable {
 			SystemCall repoquery = new SystemCall();
 			repoquery.arg(repoqueryExecutable);
 
-			File yumConfigFile = rpmFactory.getYumConfigFile(arch);
+			File yumConfigFile = rpmFactory.getYumRepoFile(arch);
 			repoquery.arg("-c", yumConfigFile.getAbsolutePath());
 			repoquery.arg("--requires");
 			repoquery.arg("--resolve");
@@ -102,6 +101,17 @@ public class CreateRpmDistribution implements Runnable {
 				}
 			}
 
+			// createrepo
+			File workspaceDir = rpmFactory.getWorkspaceDir(rpmDistribution
+					.getId());
+			SystemCall createrepo = new SystemCall();
+			createrepo.arg("createrepo");
+			createrepo.arg("-q");
+			createrepo.arg("-d");
+			File archDir = new File(workspaceDir.getPath()
+					+ targetFolder.getPath());
+			createrepo.arg(archDir.getAbsolutePath());
+			createrepo.run();
 		} catch (Exception e) {
 			throw new SlcException("Cannot generate distribution "
 					+ rpmDistribution.getId(), e);