diff options
| author | Martin Quinson <mquinson@debian.org> | 2004-06-11 18:23:54 +0000 |
|---|---|---|
| committer | Martin Quinson <mquinson@debian.org> | 2004-06-11 18:23:54 +0000 |
| commit | 626e3581bafbbfacc72033063b35856dae647e25 (patch) | |
| tree | 15d80bf85b967dccab34a2292109dfb659bcc625 | |
| parent | 5488195497ba460de07498fb93c4c3372223e3a5 (diff) | |
| download | quilt-626e3581bafbbfacc72033063b35856dae647e25.tar.gz | |
quilt return 2 when asked to do a noop (as pushing when there is nothing to push)
| -rw-r--r-- | debian/patchsys-quilt.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/patchsys-quilt.mk b/debian/patchsys-quilt.mk index 79bcfdb..5e6d15d 100644 --- a/debian/patchsys-quilt.mk +++ b/debian/patchsys-quilt.mk @@ -72,11 +72,15 @@ debian/stamp-patched: (cd $(DEB_SRCDIR); ln -s $(DEB_PATCHDIRS) $(DEB_QUILT_PATCHDIR_LINK)) ; \ fi ; \ fi - $(DEB_QUILT_CMD) push -a + # quilt exits with 2 as return when there was nothing to do. + # That's not an error here (but it's usefull to break loops in crude scripts) + $(DEB_QUILT_CMD) push -a || test $$? == 2 touch debian/stamp-patched reverse-patches: - if [ -d "$(DEB_SRCDIR)" ] ; then $(DEB_QUILT_CMD) pop -a -R ; fi + if [ -d "$(DEB_SRCDIR)" ] ; then \ + $(DEB_QUILT_CMD) pop -a -R || test $$? == 2 ; \ + fi if [ -n "$(DEB_QUILT_PATCHDIR_LINK)" ] ; then \ if [ -L $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ] ; then \ rm $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ; \ |