Skip to content

Commit d035512

Browse files
committed
Merge pull request #94 from rackerlabs/default_requires
Ensure the default requirements file is used when requires is None
2 parents e3f5c64 + 75dc772 commit d035512

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

lambda_uploader/package.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,15 @@ def requirements(self, requires):
8989
if isinstance(requires, basestring) and \
9090
os.path.isfile(os.path.abspath(requires)):
9191
self._requirements_file = os.path.abspath(requires)
92-
self._requirements = None
9392
else:
9493
if isinstance(self._requirements, basestring):
9594
requires = requires.split()
9695
self._requirements_file = None
9796
self._requirements = requires
9897
else:
98+
# If the default requirements file is found use that
99+
if os.path.isfile(self._requirements_file):
100+
return
99101
self._requirements, self._requirements_file = None, None
100102

101103
def virtualenv(self, virtualenv):

0 commit comments

Comments
 (0)