- Change packaging to conflict and remove ubuntu-sdk-device

- Bump version nr
- Try to give the developer good hints if the X socket is missing
- Forward X socket that is currently used in the session
- Use 4.1.0 tagged QtC git branch
This commit is contained in:
Benjamin Zeller
2016-08-29 18:13:51 +02:00
parent 4d722b7954
commit 3744b2cac5
19 changed files with 55 additions and 322 deletions

View File

@@ -23,11 +23,11 @@ if os.path.exists(options.source_dir):
print("Source directory exists.... removing it")
shutil.rmtree(options.source_dir)
print("Pulling branch "+args[0]+" into "+os.path.abspath(options.source_dir)+"\n")
if options.source_branch is None:
print("Pulling repository "+args[0]+" into "+os.path.abspath(options.source_dir)+"\n")
ret = subprocess.call(["git", "clone", "--depth", "1", args[0], options.source_dir])
else:
print("Pulling branch "+options.source_branch+" of repo "+args[0]+" into "+os.path.abspath(options.source_dir)+"\n")
ret = subprocess.call(["git", "clone", "--depth", "1", "-b", options.source_branch, args[0], options.source_dir])
if ret != 0:
sys.exit(ret)