Commit 374ae250 authored by Matthias Putz's avatar Matthias Putz

fixes #2, conflict with (existing) repo config files of original repo

parent 8bd509b4
...@@ -20,6 +20,7 @@ Features: ...@@ -20,6 +20,7 @@ Features:
* enable debugging: --debug * enable debugging: --debug
* set debug host: --debug-host=172.31.0.250 * set debug host: --debug-host=172.31.0.250
(default localhost, uses port is 19499) (default localhost, uses port is 19499)
* in debugger startup code: set path mappings (! elsewise breakpoints not found)
* using local git-repo (in $GIT_REPO; branch 'dev') and local git repositories (in $REPOS) * using local git-repo (in $GIT_REPO; branch 'dev') and local git repositories (in $REPOS)
$GIT_REPO/repo init -u $REPOS/manifest/ --no-repo-verify --repo-branch=dev $GIT_REPO/repo init -u $REPOS/manifest/ --no-repo-verify --repo-branch=dev
* Tracing: set environment variable * Tracing: set environment variable
......
...@@ -81,7 +81,7 @@ class GitConfig(object): ...@@ -81,7 +81,7 @@ class GitConfig(object):
if pickleFile is None: if pickleFile is None:
self._pickle = os.path.join( self._pickle = os.path.join(
os.path.dirname(self.file), os.path.dirname(self.file),
'.repopickle_' + os.path.basename(self.file)) '.repopickle_esrlabs_' + os.path.basename(self.file))
else: else:
self._pickle = pickleFile self._pickle = pickleFile
......
...@@ -422,7 +422,6 @@ def _Debug(host, env): ...@@ -422,7 +422,6 @@ def _Debug(host, env):
import pydevd import pydevd
pydevd.settrace(host, port=19499, stdoutToServer=True, stderrToServer=True) pydevd.settrace(host, port=19499, stdoutToServer=True, stderrToServer=True)
print("hey")
except ImportError: except ImportError:
traceback.print_exc(file=sys.stdout) traceback.print_exc(file=sys.stdout)
......
...@@ -93,7 +93,7 @@ import subprocess ...@@ -93,7 +93,7 @@ import subprocess
import urllib.request import urllib.request
import urllib.error import urllib.error
home_dot_repo = os.path.expanduser('~/.repoconfig') home_dot_repo = os.path.expanduser('~/.repoconfig_esrlabs')
gpg_dir = os.path.join(home_dot_repo, 'gnupg') gpg_dir = os.path.join(home_dot_repo, 'gnupg')
extra_args = [] extra_args = []
......
...@@ -674,7 +674,7 @@ def _PostRepoFetch(rp, no_repo_verify=False, verbose=False): ...@@ -674,7 +674,7 @@ def _PostRepoFetch(rp, no_repo_verify=False, verbose=False):
def _VerifyTag(project): def _VerifyTag(project):
gpg_dir = os.path.expanduser('~/.repoconfig/gnupg') gpg_dir = os.path.expanduser('~/.repoconfig_esrlabs/gnupg')
if not os.path.exists(gpg_dir): if not os.path.exists(gpg_dir):
print('warning: GnuPG was not available during last "repo init"\n' print('warning: GnuPG was not available during last "repo init"\n'
'warning: Cannot automatically authenticate repo."""', 'warning: Cannot automatically authenticate repo."""',
...@@ -725,7 +725,7 @@ class _FetchTimes(object): ...@@ -725,7 +725,7 @@ class _FetchTimes(object):
_ALPHA = 0.5 _ALPHA = 0.5
def __init__(self, manifest): def __init__(self, manifest):
self._path = os.path.join(manifest.repodir, '.repopickle_fetchtimes') self._path = os.path.join(manifest.repodir, '.repopickle_esrlabs_fetchtimes')
self._times = None self._times = None
self._seen = set() self._seen = set()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment