Remove 2nd required dependency entry added by scriptlet setter

eclipse · Sep 10, 2024 · eb8f8c3 · eb8f8c3
1 parent eeb740e
commit eb8f8c3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/rpm/src/main/java/org/eclipse/packager/rpm/build/RpmBuilder.java b/rpm/src/main/java/org/eclipse/packager/rpm/build/RpmBuilder.java
@@ -1259,12 +1259,9 @@ private void setScript(final RpmTag interpreterTag, final RpmTag scriptTag, fina
 
  private void addInterpreterRequirement(final String interpreter, RpmDependencyFlags scriptPhaseFlag) {
  if (isEmbeddedLuaInterpreter(interpreter)) {
- addRequirement(EMBEDDED_LUA_INTERPRETER_REQUIREMENT_NAME, EMBEDDED_LUA_INTERPRETER_REQUIREMENT_VERSION,
- RpmDependencyFlags.INTERPRETER, RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB);
  addRequirement(EMBEDDED_LUA_INTERPRETER_REQUIREMENT_NAME, EMBEDDED_LUA_INTERPRETER_REQUIREMENT_VERSION,
  scriptPhaseFlag, RpmDependencyFlags.INTERPRETER, RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB);
  } else {
- addRequirement(interpreter, null, RpmDependencyFlags.INTERPRETER);
  addRequirement(interpreter, null, scriptPhaseFlag, RpmDependencyFlags.INTERPRETER);
  }
  }

diff --git a/rpm/src/test/java/org/eclipse/packager/rpm/ScriptletWriterTest.java b/rpm/src/test/java/org/eclipse/packager/rpm/ScriptletWriterTest.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import org.eclipse.packager.rpm.app.Dumper;
 import org.eclipse.packager.rpm.build.RpmBuilder;
 import org.eclipse.packager.rpm.deps.Dependency;
 import org.eclipse.packager.rpm.deps.RpmDependencyFlags;
@@ -70,12 +71,9 @@ void combinedScriptTest() throws IOException {
  Path outFile;
 
  List<Dependency> expectedRequiredDependencies = List.of(
- new Dependency("rpmlib(BuiltinLuaScripts)", "4.2.2-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB, RpmDependencyFlags.INTERPRETER),
  new Dependency("rpmlib(BuiltinLuaScripts)", "4.2.2-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB, RpmDependencyFlags.INTERPRETER, RpmDependencyFlags.SCRIPT_PRE),
  new Dependency("rpmlib(BuiltinLuaScripts)", "4.2.2-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB, RpmDependencyFlags.INTERPRETER, RpmDependencyFlags.PRETRANS),
- new Dependency(customInterpreter, "", RpmDependencyFlags.INTERPRETER),
  new Dependency(customInterpreter, "", RpmDependencyFlags.INTERPRETER, RpmDependencyFlags.SCRIPT_POST),
- new Dependency(shellInterpreter, "", RpmDependencyFlags.INTERPRETER),
  new Dependency(shellInterpreter, "", RpmDependencyFlags.INTERPRETER, RpmDependencyFlags.SCRIPT_POSTUN),
  new Dependency(shellInterpreter, "", RpmDependencyFlags.INTERPRETER, RpmDependencyFlags.POSTTRANS),
  new Dependency("rpmlib(CompressedFileNames)", "3.0.4-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB),
@@ -137,15 +135,13 @@ public static Stream<Arguments> scriptSource() {
 
  public static List<Dependency> simpleLuaDependencyFor(RpmDependencyFlags scriptletPhase) {
  return List.of(
- new Dependency("rpmlib(BuiltinLuaScripts)", "4.2.2-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB, RpmDependencyFlags.INTERPRETER),
  new Dependency("rpmlib(BuiltinLuaScripts)", "4.2.2-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB, RpmDependencyFlags.INTERPRETER, scriptletPhase),
  new Dependency("rpmlib(CompressedFileNames)", "3.0.4-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB),
  new Dependency("rpmlib(PayloadFilesHavePrefix)", "4.0-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB));
  }
 
  public static List<Dependency> simpleInterpreterDependencyFor(String interpreter, RpmDependencyFlags scriptletPhase) {
  return List.of(
- new Dependency(interpreter, "", RpmDependencyFlags.INTERPRETER),
  new Dependency(interpreter, "", RpmDependencyFlags.INTERPRETER, scriptletPhase),
  new Dependency("rpmlib(CompressedFileNames)", "3.0.4-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB),
  new Dependency("rpmlib(PayloadFilesHavePrefix)", "4.0-1", RpmDependencyFlags.LESS, RpmDependencyFlags.EQUAL, RpmDependencyFlags.RPMLIB));