Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
slapos.buildout
Commits
fe953bf7
Commit
fe953bf7
authored
Apr 07, 2014
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Typo and indentation corrections. One more resource warning.
parent
6c97510b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+4
-3
src/zc/buildout/testing.py
src/zc/buildout/testing.py
+3
-3
No files found.
src/zc/buildout/easy_install.py
View file @
fe953bf7
...
@@ -1154,10 +1154,11 @@ def _create_script(contents, dest):
...
@@ -1154,10 +1154,11 @@ def _create_script(contents, dest):
win32_changed
=
True
win32_changed
=
True
if
os
.
path
.
exists
(
win32_exe
):
if
os
.
path
.
exists
(
win32_exe
):
with
open
(
win32_exe
,
'rb'
)
as
f
:
with
open
(
win32_exe
,
'rb'
)
as
f
:
win32_changed
=
f
.
re
o
d
()
!=
new_data
win32_changed
=
f
.
re
a
d
()
!=
new_data
if
win32_changed
:
if
win32_changed
:
# Only write it if it's different.
# Only write it if it's different.
open
(
win32_exe
,
'wb'
).
write
(
new_data
)
with
open
(
win32_exe
,
'wb'
)
as
f
:
f
.
write
(
new_data
)
generated
.
append
(
win32_exe
)
generated
.
append
(
win32_exe
)
if
changed
:
if
changed
:
...
@@ -1234,7 +1235,7 @@ def _pyscript(path, dest, rsetup, initialization=''):
...
@@ -1234,7 +1235,7 @@ def _pyscript(path, dest, rsetup, initialization=''):
# generate exe file and give the script a magic name:
# generate exe file and give the script a magic name:
exe
=
script
+
'.exe'
exe
=
script
+
'.exe'
with
open
(
exe
,
'wb'
)
as
f
:
with
open
(
exe
,
'wb'
)
as
f
:
f
.
write
(
f
.
write
(
pkg_resources
.
resource_string
(
'setuptools'
,
'cli.exe'
)
pkg_resources
.
resource_string
(
'setuptools'
,
'cli.exe'
)
)
)
generated
.
append
(
exe
)
generated
.
append
(
exe
)
...
...
src/zc/buildout/testing.py
View file @
fe953bf7
...
@@ -242,7 +242,7 @@ def buildoutSetUp(test):
...
@@ -242,7 +242,7 @@ def buildoutSetUp(test):
# Create a basic buildout.cfg to avoid a warning from buildout:
# Create a basic buildout.cfg to avoid a warning from buildout:
with
open
(
'buildout.cfg'
,
'w'
)
as
f
:
with
open
(
'buildout.cfg'
,
'w'
)
as
f
:
f
.
write
(
"[buildout]
\
n
parts =
\
n
"
)
f
.
write
(
"[buildout]
\
n
parts =
\
n
"
)
# Use the buildout bootstrap command to create a buildout
# Use the buildout bootstrap command to create a buildout
zc
.
buildout
.
buildout
.
Buildout
(
zc
.
buildout
.
buildout
.
Buildout
(
...
@@ -473,7 +473,7 @@ def install(project, destination):
...
@@ -473,7 +473,7 @@ def install(project, destination):
else
:
else
:
# copy link
# copy link
with
open
(
os
.
path
.
join
(
destination
,
project
+
'.egg-link'
),
'w'
)
as
f
:
with
open
(
os
.
path
.
join
(
destination
,
project
+
'.egg-link'
),
'w'
)
as
f
:
f
.
write
(
dist
.
location
)
f
.
write
(
dist
.
location
)
def
install_develop
(
project
,
destination
):
def
install_develop
(
project
,
destination
):
if
not
isinstance
(
destination
,
str
):
if
not
isinstance
(
destination
,
str
):
...
@@ -483,7 +483,7 @@ def install_develop(project, destination):
...
@@ -483,7 +483,7 @@ def install_develop(project, destination):
dist
=
pkg_resources
.
working_set
.
find
(
dist
=
pkg_resources
.
working_set
.
find
(
pkg_resources
.
Requirement
.
parse
(
project
))
pkg_resources
.
Requirement
.
parse
(
project
))
with
open
(
os
.
path
.
join
(
destination
,
project
+
'.egg-link'
),
'w'
)
as
f
:
with
open
(
os
.
path
.
join
(
destination
,
project
+
'.egg-link'
),
'w'
)
as
f
:
f
.
write
(
dist
.
location
)
f
.
write
(
dist
.
location
)
def
_normalize_path
(
match
):
def
_normalize_path
(
match
):
path
=
match
.
group
(
1
)
path
=
match
.
group
(
1
)
...
...
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