[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/1.2.7-1-10-ga4eec3f

[Iustin Pop]

The following commit has been merged in the master branch:
commit 566a87dbff209f2476006a11db3b3b76e485860f
Author: Iustin Pop <iusty at k1024.org>
Date:   Mon Jul 13 21:19:38 2009 +0200

    Add quilt support
    
    There are a couple of things that need patching, and the easiest is with quilt.

diff --git a/debian/control b/debian/control
index dc6eaa9..a0b542d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Debian Ganeti Team <pkg-ganeti-devel at lists.alioth.debian.org>
 Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iusty at k1024.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), quilt
 Build-Depends-Indep: docbook-utils, python-simplejson, python-pyparsing, python-openssl, python-support (>= 0.6)
 Standards-Version: 3.8.2
 Homepage: http://code.google.com/p/ganeti/
diff --git a/debian/patches/00-fix-twisted-waker-fds.patch b/debian/patches/00-fix-twisted-waker-fds.patch
deleted file mode 100644
index cee0317..0000000
--- a/debian/patches/00-fix-twisted-waker-fds.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 2bdcf7290c87ff18eb4f5ce3955bc0a610a9e3c8
-Author: Iustin Pop <iustinp at gmail.com>
-Date:   Tue Feb 10 13:04:55 2009 +0000
-
-    Workaround twisted 8.x pipe-based waker
-    
-    Twisted 8.x uses a waker objects for inter-thread signalling and the on
-    POSIX platforms the waker uses pipes for communication, which should not
-    be closed.
-    
-    For some reasons, sometime the waker deals with its pipes being closed,
-    while at other times it doesn't. As such, we workaround it by skipping
-    the waker file descriptors in the utils.Daemonize function. This is
-    fragile and will break if Twisted changes internals, but it's a simple
-    workaround for now.
-    
-    The patch also adds an assert in Daemonize() so that “standard” file
-    descriptors (0, 1, 2) are not marked to be kept open.
-    
-    Reviewed-by: imsnah
-    
-    git-svn-id: https://ganeti.googlecode.com/svn/branches/ganeti/ganeti-1.2@2461 a6b21a0d-9e31-0410-a73f-d369b950c04d
-
-diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
-index 58c3804..892db24 100755
---- a/daemons/ganeti-noded
-+++ b/daemons/ganeti-noded
-@@ -618,8 +618,15 @@ def main():
-       sys.exit(5)
- 
-   # become a daemon
-+  noclose_fds = []
-+  if hasattr(reactor, 'waker'):
-+    # twisted with waker object which has extra fds in use
-+    for attr in ('i', 'o'):
-+      val = getattr(reactor.waker, attr, None)
-+      if isinstance(val, int):
-+        noclose_fds.append(val)
-   if options.fork:
--    utils.Daemonize(logfile=constants.LOG_NODESERVER)
-+    utils.Daemonize(logfile=constants.LOG_NODESERVER, noclose_fds=noclose_fds)
- 
-   logger.SetupLogging(twisted_workaround=True, debug=options.debug,
-                       program="ganeti-noded")
-diff --git a/lib/utils.py b/lib/utils.py
-index 083fd2d..f6c00ee 100644
---- a/lib/utils.py
-+++ b/lib/utils.py
-@@ -1160,6 +1160,7 @@ def Daemonize(logfile, noclose_fds=None):
-   # Iterate through and close all file descriptors.
-   for fd in range(0, maxfd):
-     if noclose_fds and fd in noclose_fds:
-+      assert fd > 2, "Cannot keep open standard fd %d" % fd
-       continue
-     try:
-       os.close(fd)
diff --git a/debian/rules b/debian/rules
index 587e70e..27f82d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -22,9 +24,9 @@ build-stamp:
 
 	#$(MAKE)
 
-	touch build-stamp
+	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp

-- 
Ganeti packaging