Skip to content

Commit 6d4bbcd

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 585bff9 + 9073920 commit 6d4bbcd

File tree

9 files changed

+255
-224
lines changed

9 files changed

+255
-224
lines changed

.rultor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ install: |-
1010
chmod u+r+x target/dbgit/bin/dbgit
1111
merge:
1212
script: |-
13-
mvn test -Dtest=*selfTest,*DbGitIntegrationTestBasic* --batch-mode
13+
mvn test -Dtest=${tests:-'*selfTest,*DbGitIntegrationTestBasic*'} --batch-mode
1414
deploy:
1515
script: |-
16-
mvn test -Dtest=$tests --batch-mode
16+
mvn test -Dtest=${tests:-'*selfTest,*DbGitIntegrationTestBasic*'} --batch-mode

src/main/java/ru/fusionsoft/dbgit/command/CmdRestore.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,9 @@ private boolean checkNeedsRestore(IMetaObject obj){
210210
final boolean exists = GitMetaDataManager.getInstance().loadFromDB(dbObj);
211211
isRestore = !exists || !dbObj.getHash().equals(obj.getHash());
212212
} catch (ExceptionDBGit e) {
213-
isRestore = true;
214-
e.printStackTrace();
213+
throw new ExceptionDBGitRunTime(e);
214+
// isRestore = true;
215+
// e.printStackTrace();
215216
}
216217
return isRestore;
217218
}

src/main/java/ru/fusionsoft/dbgit/core/DBGitIndex.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ public boolean removeItem(String name) {
7777
saveDBIndex();
7878
return true;
7979
} catch (Exception ex){
80-
ex.printStackTrace();
81-
return false;
80+
throw new ExceptionDBGitRunTime("Remove item from index error", ex);
8281
}
8382
}
8483

0 commit comments

Comments
 (0)