diff options
| author | Jun Wang <junbill.wang@samsung.com> | 2016-01-28 22:50:55 +0800 |
|---|---|---|
| committer | Jun Wang <junbill.wang@samsung.com> | 2016-01-28 22:50:55 +0800 |
| commit | 27761b16936562b0d6d9ce71de948091b1cf229d (patch) | |
| tree | 1c5569e5228cee837d8d0f2b59be9f9e106b9ad8 /bin/git-pbuilder | |
| parent | 0eae33b7dff9b06aade2ac401416cb67a368250d (diff) | |
| download | git-buildpackage-27761b16936562b0d6d9ce71de948091b1cf229d.tar.gz git-buildpackage-27761b16936562b0d6d9ce71de948091b1cf229d.tar.bz2 git-buildpackage-27761b16936562b0d6d9ce71de948091b1cf229d.zip | |
fix merge errors
Change-Id: I4419bb8322f341f92db7e9e19f60ffaa93af2171
Diffstat (limited to 'bin/git-pbuilder')
| -rw-r--r-- | bin/git-pbuilder | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/git-pbuilder b/bin/git-pbuilder index a9104d7a..a003b266 100644 --- a/bin/git-pbuilder +++ b/bin/git-pbuilder @@ -228,8 +228,7 @@ update|create|login) sudo "$BUILDER" --"$action" --distribution "$DIST" \ --othermirror "$OTHERMIRROR" "${OPTIONS[@]}" "$@" else - sudo "$BUILDER" --"$action" --distribution "$DIST" \ - "${OPTIONS[@]}" "$@" + sudo "$BUILDER" --"$action" --distribution "$DIST" "${OPTIONS[@]}" "$@" fi fi exit $? |