Changes needed to build packages with git (BLD-271)

This commit is contained in:
Tomislav Plavcic
2015-06-05 11:28:15 +02:00
parent 66c74af47b
commit 7fbfcaab3d
2 changed files with 7 additions and 7 deletions

View File

@@ -6,8 +6,8 @@ Build-Depends: debhelper (>= 4.2)
Build-Depends-Indep: perl (>= 5.6.0-16) Build-Depends-Indep: perl (>= 5.6.0-16)
Standards-Version: 3.7.2 Standards-Version: 3.7.2
Homepage: http://www.percona.com/software/percona-toolkit/ Homepage: http://www.percona.com/software/percona-toolkit/
Vcs-Browser: http://bazaar.launchpad.net/~percona-toolkit-dev/percona-toolkit/0.9/files Vcs-Browser: https://github.com/percona/percona-toolkit
Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~percona-toolkit-ddev/percona-toolkit/0.9/ Vcs-Git: git://github.com/percona/percona-toolkit.git
Package: percona-toolkit Package: percona-toolkit
Architecture: all Architecture: all

View File

@@ -86,8 +86,8 @@ TAR=${TAR:-tar}
check_branch() { check_branch() {
echo -n "Checking branch... " echo -n "Checking branch... "
local clean_branch=$(bzr version-info --check-clean | grep -i 'clean: True') local clean_branch=$(git status --porcelain|wc -l)
if [ -z "$clean_branch" ]; then if [ "$clean_branch" -gt 0 ]; then
die "The branch has uncommitted changes or unknown files" die "The branch has uncommitted changes or unknown files"
fi fi
echo "OK" echo "OK"
@@ -491,9 +491,9 @@ if [ $BUILD -eq 1 ]; then
Branch verified and updated; ready to build $PKG, Branch verified and updated; ready to build $PKG,
but first you must: but first you must:
1. bzr diff and review the changes (Changelog, percon-toolkit.pod, etc.) 1. git diff and review the changes (Changelog, percon-toolkit.pod, etc.)
2. bzr commit -m "Build $PKG" 2. git commit -m "Build $PKG"
3. bzr push 3. git push
Press any key to continue... (or Ctrl-C to abort) Press any key to continue... (or Ctrl-C to abort)
MSG MSG