Rename patch-tools/ to staging/.

This commit is contained in:
Sebastian Lackner 2015-11-23 02:43:28 +01:00
parent 83bc0c02bd
commit 87b990dc41
9 changed files with 11 additions and 11 deletions

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
patch-tools/wine
staging/wine
*.pyc
.patchupdate.cache

View File

@ -47,7 +47,7 @@ Included bug fixes and improvements
yet available in vanilla Wine. They are removed from the list as soon as they
are included upstream. The list also includes features and fixes from previous
releases, take a look at the
[changelog](https://github.com/wine-compholio/wine-staging/blob/master/patch-tools/changelog)
[changelog](https://github.com/wine-compholio/wine-staging/blob/master/staging/changelog)
for more details.*
* Add IDragSourceHelper stub interface ([Wine Bug #24699](https://bugs.winehq.org/show_bug.cgi?id=24699))

View File

@ -8,8 +8,8 @@ warning()
echo ""
}
if git status --porcelain "patch-tools" | grep "^.[^ ]" &> /dev/null; then
warning "PLEASE ADD OR STASH YOUR CHANGES IN patch-tools"
if git status --porcelain "staging" | grep "^.[^ ]" &> /dev/null; then
warning "PLEASE ADD OR STASH YOUR CHANGES IN staging"
exit 1
fi
@ -19,9 +19,9 @@ if git status --porcelain "patches" | grep -v "^.\\?.*\\.py$" | grep "^.[^ ]" &>
fi
git diff --cached --name-status | while read status file; do
if [[ "$file" =~ ^patches/ ]] || [[ "$file" =~ ^patch-tools/ ]]; then
if [[ "$file" =~ ^patches/ ]] || [[ "$file" =~ ^staging/ ]]; then
warning "UPDATING AUTOGENERATED FILES"
./patch-tools/patchupdate.py || exit 1
./staging/patchupdate.py || exit 1
break;
fi
done

View File

@ -55,13 +55,13 @@ class config(object):
path_config = os.path.expanduser("~/.config/patchupdate.conf")
path_patches = "patches"
path_changelog = "patch-tools/changelog"
path_wine = "patch-tools/wine"
path_changelog = "staging/changelog"
path_wine = "staging/wine"
path_template_script = "patch-tools/patchinstall.sh.in"
path_template_script = "staging/patchinstall.sh.in"
path_script = "patches/patchinstall.sh"
path_template_README_md = "patch-tools/README.md.in"
path_template_README_md = "staging/README.md.in"
path_README_md = "README.md"
path_IfDefined = "9999-IfDefined.patch"
@ -859,7 +859,7 @@ def generate_markdown(all_patches, release_patches):
lines.append("yet available in vanilla Wine. They are removed from the list as soon as they")
lines.append("are included upstream. The list also includes features and fixes from previous")
lines.append("releases, take a look at the")
lines.append("[changelog](https://github.com/wine-compholio/wine-staging/blob/master/patch-tools/changelog)")
lines.append("[changelog](https://github.com/wine-compholio/wine-staging/blob/master/staging/changelog)")
lines.append("for more details.*")
lines.append("")
for mode, bugid, bugname in sorted(old_fixes, key=lambda x: x[2]):