Fix SLC

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / java / org / argeo / slc / lib / linux / rpmfactory / BuildInMock.java

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java
index c4b35a9a7906d9f50183513473a79ecb3fe50e9b..364d54df8946897b88216450dacd4888d38acaec 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java
@@ -43,6 +43,8 @@ public class BuildInMock implements Runnable {
        private RpmBuildEnvironment buildEnvironment;
        private Executor executor;
 
+       private String debuginfoDirName = "debuginfo";
+
        public void run() {
                // TODO check if caller is in mock group
 
@@ -69,8 +71,10 @@ public class BuildInMock implements Runnable {
                mock.setExecutor(executor);
                mock.run();
 
+               // File repoDir = new File(buildEnvironment.getStagingBase() + "/"
+               // + repository + "/" + level + "/" + release);
                File repoDir = new File(buildEnvironment.getStagingBase() + "/"
-                               + repository + "/" + level + "/" + release);
+                               + repository + "-staging" + "/" + release);
                File srpmDir = new File(repoDir, "SRPMS");
                if (mkdirs)
                        srpmDir.mkdirs();
@@ -78,7 +82,7 @@ public class BuildInMock implements Runnable {
                File debuginfoDir = null;
                if (!arch.equals(NOARCH)) {
                        archDir = new File(repoDir, arch);
-                       debuginfoDir = new File(archDir, "debuginfo");
+                       debuginfoDir = new File(archDir, debuginfoDirName);
                        debuginfoDir.mkdirs();
                }
 
@@ -120,6 +124,9 @@ public class BuildInMock implements Runnable {
                        createrepo.arg("createrepo");
                        // sqllite db
                        createrepo.arg("-d");
+                       // debuginfo
+                       if (!repoToRecreate.getName().equals(debuginfoDirName))
+                               createrepo.arg("-x").arg(debuginfoDirName + "/*");
                        // quiet
                        createrepo.arg("-q");
                        createrepo.arg(repoToRecreate.getAbsolutePath());