Skip to content

The [files]/include directive should accept unix style glob expressions #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GaretJax wants to merge 2 commits into
base: master
Choose a base branch
from
Open

The [files]/include directive should accept unix style glob expressions #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99a5bb2
Enable the files/include settings directive to accept unix style glob…
GaretJax Aug 7, 2011
a9f8974
Support hg repos too when using include files glob expressions.
GaretJax Aug 7, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions gondor/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import argparse
import ConfigParser
import getpass
import glob
import gzip
import os
import re
Expand Down Expand Up @@ -205,11 +206,8 @@ def cmd_deploy(args, config):
"staticfiles": config_value(local_config, "app", "staticfiles"),
"site_media_url": config_value(local_config, "app", "site_media_url"),
}
include_files = [
x.strip()
for x in config_value(local_config, "files", "include", "").split("\n")
if x
]
include_expr = config_value(local_config, "files", "include", "").split("\n")

out("[ok]\n")

if vcs == "git":
Expand Down Expand Up @@ -251,6 +249,13 @@ def cmd_deploy(args, config):
error(output)
out("[ok]\n")

include_files = []
cwd = os.getcwd()
os.chdir(repo_root)
for x in include_expr:
include_files += glob.glob(x)
os.chdir(cwd)

if include_files:
out("Adding untracked files... ")
try:
Expand Down