Skip to content

Commit 043489a

Browse files
committed
fix Releaser logic
1 parent cca72f8 commit 043489a

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/java/org/scm4j/releaser/SCMReleaser.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,10 @@ public IAction getProductionReleaseAction(Component comp, ActionKind actionKind)
6969
List<IAction> childActions = new ArrayList<>();
7070
ReleaseBranch rb = new ReleaseBranch(comp);
7171
List<Component> mDeps;
72-
if (!rb.exists()) {
73-
DevelopBranch db = new DevelopBranch(comp);
74-
mDeps = db.getMDeps();
75-
} else {
72+
if (rb.exists()) {
7673
mDeps = rb.getMDeps();
74+
} else {
75+
mDeps = new DevelopBranch(comp).getMDeps();
7776
}
7877

7978
for (Component mDep : mDeps) {

src/main/java/org/scm4j/releaser/branch/ReleaseBranch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public String toString() {
250250
public List<Component> getMDeps() {
251251
try {
252252
String mDepsFileContent = comp.getVCS().getFileContent(name, SCMReleaser.MDEPS_FILE_NAME, null);
253-
MDepsFile mDeps = new MDepsFile(mDepsFileContent, false);
253+
MDepsFile mDeps = new MDepsFile(mDepsFileContent);
254254
return mDeps.getMDeps();
255255
} catch (EVCSFileNotFound e) {
256256
return new ArrayList<>();

0 commit comments

Comments
 (0)