mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-17 18:17:43 +00:00
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
This commit is contained in:
commit
7d0c40b3a6
@ -33,7 +33,7 @@ import org.netbeans.swing.tabcontrol.TabDisplayerUI;
|
||||
*
|
||||
* @author dfickling
|
||||
*/
|
||||
class NoTabsTabDisplayerUI extends TabDisplayerUI {
|
||||
public class NoTabsTabDisplayerUI extends TabDisplayerUI {
|
||||
|
||||
/** Creates a new instance of NoTabsTabDisplayerUI */
|
||||
public NoTabsTabDisplayerUI(TabDisplayer displayer) {
|
||||
|
@ -78,6 +78,9 @@ def gitPull(TskOrAutopsy, branch):
|
||||
ccwd = os.path.join("..", "..", "..", "sleuthkit")
|
||||
else:
|
||||
ccwd = os.path.join("..", "..")
|
||||
print("Resetting " + TskOrAutopsy)
|
||||
call = ["git", "reset", "--hard"]
|
||||
subprocess.call(call, stdout=sys.stdout, cwd=ccwd)
|
||||
print("Checking out " + branch)
|
||||
call = ["git", "checkout", branch]
|
||||
subprocess.call(call, stdout=sys.stdout, cwd=ccwd)
|
||||
|
Loading…
x
Reference in New Issue
Block a user