← Back to branch summary

~ubuntu-branches/ubuntu/raring/autofs5/raring

« back to all changes in this revision

Viewing changes to debian/patches/01UPSTREAM_autofs-5.0.3-expire-works-too-hard-update-2.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jan Christoph Nordholz
  • Date: 2009-03-09 01:16:48 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090309011648-gjynlid883f0s2c4
Tags: 5.0.4-1
http://bugs.debian.org/518728
* New upstream version (5.0.4 plus patchset as of 2009/03/09).
  * Closes: #518728.
  * Remove dpatch 14, applied upstream.
* New dpatch 14 to avoid using the relatively young SOCK_CLOEXEC
  feature.
* Only invoke 'make clean' on clean target so ./configure isn't
  purged.
* Fix a typo in the postinst regarding the ucf conffile handling.
* Add 'set -e' to package maintenance scripts.
* Drop unnecessary /var/run/autofs from package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01UPSTREAM_autofs-5.0.3-expire-works-too-hard-update-2.patch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 01UPSTREAM_autofs-5.0.3-expire-works-too-hard-update-2.patch
3
 
## DP: Supplied by upstream.
4
 
 
5
 
@DPATCH@
6
 
 
7
 
diff --git a/daemon/indirect.c b/daemon/indirect.c
8
 
index a098d42..51172f2 100644
9
 
--- a/daemon/indirect.c
10
 
+++ b/daemon/indirect.c
11
 
@@ -420,6 +420,8 @@ void *expire_proc_indirect(void *arg)
12
 
                        if (strstr(next->opts, "indirect"))
13
 
                                master_notify_submount(ap, next->path, ap->state);
14
 
                        pthread_setcancelstate(cur_state, NULL);
15
 
+
16
 
+                       continue;
17
 
                }
18
 
 
19
 
                if (ap->state == ST_EXPIRE || ap->state == ST_PRUNE)