Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scapy
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
scapy
Commits
737dc84e
Commit
737dc84e
authored
8 years ago
by
Guillaume Valadon
Browse files
Options
Downloads
Plain Diff
Merge pull request #106 from p-l-/fix-101
python --version may output to stderr (fixes #101)
parents
66064db6
37cc56cf
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
run_scapy
+1
-1
1 addition, 1 deletion
run_scapy
test/run_tests
+1
-1
1 addition, 1 deletion
test/run_tests
with
2 additions
and
2 deletions
run_scapy
+
1
−
1
View file @
737dc84e
#! /bin/sh
DIR
=
$(
dirname
$0
)
if
python
--version
|
grep
-q
'^Python 2'
;
then
if
python
--version
2>&1
|
grep
-q
'^Python 2'
;
then
PYTHON
=
python
else
PYTHON
=
python2
...
...
This diff is collapsed.
Click to expand it.
test/run_tests
+
1
−
1
View file @
737dc84e
#! /bin/bash
DIR
=
$(
dirname
$0
)
/..
if
python
--version
|
grep
-q
'^Python 2'
;
then
if
python
--version
2>&1
|
grep
-q
'^Python 2'
;
then
PYTHON
=
python
else
PYTHON
=
python2
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment