Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.recipe.build.saved
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos.recipe.build.saved
Commits
1847206c
Commit
1847206c
authored
Oct 07, 2014
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Revert "gitclone: do not force to use 'master' branch when not specified.""
This reverts commit
83632948
.
parent
9fff941c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
slapos/recipe/gitclone.py
slapos/recipe/gitclone.py
+2
-2
No files found.
slapos/recipe/gitclone.py
View file @
1847206c
...
@@ -127,7 +127,7 @@ class Recipe(object):
...
@@ -127,7 +127,7 @@ class Recipe(object):
options
.
setdefault
(
'location'
,
options
.
setdefault
(
'location'
,
os
.
path
.
join
(
buildout
[
'buildout'
][
'parts-directory'
],
name
))
os
.
path
.
join
(
buildout
[
'buildout'
][
'parts-directory'
],
name
))
self
.
repository
=
options
.
get
(
'repository'
)
self
.
repository
=
options
.
get
(
'repository'
)
self
.
branch
=
options
.
get
(
'branch'
,
GIT_DEFAULT_BRANCH_NAME
)
self
.
branch
=
options
.
get
(
'branch'
)
self
.
revision
=
options
.
get
(
'revision'
)
self
.
revision
=
options
.
get
(
'revision'
)
self
.
git_command
=
options
.
get
(
'git-executable'
,
'git'
)
self
.
git_command
=
options
.
get
(
'git-executable'
,
'git'
)
self
.
name
=
name
self
.
name
=
name
...
@@ -141,7 +141,7 @@ class Recipe(object):
...
@@ -141,7 +141,7 @@ class Recipe(object):
# Check if input is correct
# Check if input is correct
if
not
self
.
repository
:
if
not
self
.
repository
:
raise
UserError
(
'repository parameter is mandatory.'
)
raise
UserError
(
'repository parameter is mandatory.'
)
if
self
.
revision
and
self
.
branch
!=
GIT_DEFAULT_BRANCH_NAME
:
if
self
.
revision
and
self
.
branch
:
# revision and branch options are incompatible
# revision and branch options are incompatible
raise
UserError
(
'revision and branch (other than master) parameters '
raise
UserError
(
'revision and branch (other than master) parameters '
'are set but are incompatible. Please specify only one of them.'
)
'are set but are incompatible. Please specify only one of them.'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment