projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow gitdoadm to sudo to git
[mirror/dsa-puppet.git]
/
modules
/
porterbox
/
files
/
dd-schroot-cmd
diff --git
a/modules/porterbox/files/dd-schroot-cmd
b/modules/porterbox/files/dd-schroot-cmd
index
8dc7a4b
..
598fb12
100755
(executable)
--- a/
modules/porterbox/files/dd-schroot-cmd
+++ b/
modules/porterbox/files/dd-schroot-cmd
@@
-56,7
+56,7
@@
def die(s):
sys.exit(1)
def get_session_owner(session):
sys.exit(1)
def get_session_owner(session):
- if re.search('
[^0-9a-zA-Z_
-]', session):
+ if re.search('
^\.|~$|[^0-9a-zA-Z_.~
-]', session):
die("Invalid session name.")
path = os.path.join('/var/lib/schroot/session', session)
die("Invalid session name.")
path = os.path.join('/var/lib/schroot/session', session)
@@
-80,7
+80,7
@@
def ensure_ok(session):
die("Session owner mismatch.")
def os_supports_unshare():
die("Session owner mismatch.")
def os_supports_unshare():
- if platform.uname()[0]
== 'GNU/kFreeBSD'
:
+ if platform.uname()[0]
in ('GNU/kFreeBSD', 'GNU')
:
return False
return True
return False
return True
@@
-180,7
+180,7
@@
class AptSchroot:
self.apt_simulate_and_ask(['install', '--'] + packages)
def apt_build_dep(self, packages, archonly=False):
self.apt_simulate_and_ask(['install', '--'] + packages)
def apt_build_dep(self, packages, archonly=False):
- cmd =
['build-dep'] + (['--arch-only'] if archonly else []) + [
'--']
+ cmd =
(['--arch-only'] if archonly else []) + ['build-dep',
'--']
self.apt_simulate_and_ask(cmd + packages)
def apt_simulate_and_ask(self, cmd, split_download=True, run_clean=True):
self.apt_simulate_and_ask(cmd + packages)
def apt_simulate_and_ask(self, cmd, split_download=True, run_clean=True):