[Pkg-ocaml-maint-commits] r5810 - in /trunk/packages/camlpdf/trunk/debian: changelog control control.in
Author: toots
Date: Sat Jun 28 16:26:13 2008
New Revision: 5810
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5810
Log:
Finished 0.3-1..
Modified:
trunk/packages/camlpdf/trunk/debian/changelog
trunk/packages/camlpdf/trunk/debian/control
trunk/packages/camlpdf/trunk/debian/control.in
Modified: trunk/packages/camlpdf/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk/debian/changelog?rev=5810&op=diff
==
--- trunk/packages/camlpdf/trunk/debian/changelog (original)
+++ trunk/packages/camlpdf/trunk/debian/changelog Sat Jun 28 16:26:13 2008
@@ -1,5 +1,5 @@
camlpdf (0.3-1) unstable; urgency=low
- * Initial upload to unstable (Closes: 485949)
+ * Initial upload to unstable (Closes: #485949)
-- Romain Beauxis <[EMAIL PROTECTED]> Thu, 12 Jun 2008 14:14:29 +0200
Modified: trunk/packages/camlpdf/trunk/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk/debian/control?rev=5810&op=diff
==
--- trunk/packages/camlpdf/trunk/debian/control (original)
+++ trunk/packages/camlpdf/trunk/debian/control Sat Jun 28 16:26:13 2008
@@ -12,7 +12,7 @@
Package: libcamlpdf-ocaml-dev
Architecture: any
Section: non-free/libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libzip-ocaml-dev
+Depends: ocaml-nox-${F:OCamlABI}, libzip-ocaml-dev
Recommends: ocaml-findlib
Description: library for reading, writing and manipulating PDF files and data
CamlPDF consists of a set of low level modules for representing,
Modified: trunk/packages/camlpdf/trunk/debian/control.in
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk/debian/control.in?rev=5810&op=diff
==
--- trunk/packages/camlpdf/trunk/debian/control.in (original)
+++ trunk/packages/camlpdf/trunk/debian/control.in Sat Jun 28 16:26:13 2008
@@ -12,7 +12,7 @@
Package: libcamlpdf-ocaml-dev
Architecture: any
Section: non-free/libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, libzip-ocaml-dev
+Depends: ocaml-nox-${F:OCamlABI}, libzip-ocaml-dev
Recommends: ocaml-findlib
Description: library for reading, writing and manipulating PDF files and data
CamlPDF consists of a set of low level modules for representing,
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. bc5664e965a91cf134293d7ec2bb38cb77589dbc
The following commit has been merged in the master branch: commit 76a81def410de502e249e983d87ff7917a9cdcc2 Author: Sylvain Le Gall <[EMAIL PROTECTED]> Date: Sat Jun 28 16:57:54 2008 +0200 Add README.source explaining to use quilt. diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000..92926c8 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,5 @@ +This package use quilt for patching the source. + +Please consider reading quilt manpage to patch the source. + + -- Sylvain Le Gall <[EMAIL PROTECTED]> Sat, 28 Jun 2008 16:54:35 +0200 -- ocaml-libvirt packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. bc5664e965a91cf134293d7ec2bb38cb77589dbc
The following commit has been merged in the master branch: commit 3dcfa9c1c64d0a4ef04c7cb7631dc3cb99e21647 Author: Sylvain Le Gall <[EMAIL PROTECTED]> Date: Sat Jun 28 16:58:49 2008 +0200 Remove auto-generated files from source. diff --git a/debian/rules b/debian/rules index 05e25df..726d229 100755 --- a/debian/rules +++ b/debian/rules @@ -38,8 +38,20 @@ DEB_MAKE_INSTALL_TARGET += OCAMLDESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" DE OCAML_OCAMLDOC_PACKAGES = libvirt-ocaml-dev clean:: - $(RM) '$(CURDIR)/debian/libvirt-ocaml-dev.dirs' - $(RM) '$(CURDIR)/debian/libvirt-ocaml.dirs' + -$(RM) '$(CURDIR)/META' + -$(RM) '$(CURDIR)/Make.rules' + -$(RM) '$(CURDIR)/Makefile' + -$(RM) '$(CURDIR)/config.h' + -$(RM) '$(CURDIR)/config.log' + -$(RM) '$(CURDIR)/config.status' + -$(RM) '$(CURDIR)/examples/Makefile' + -$(RM) '$(CURDIR)/libvirt/Makefile' + -$(RM) '$(CURDIR)/libvirt/libvirt_version.ml' + -$(RM) '$(CURDIR)/mlvirsh/Makefile' + -$(RM) '$(CURDIR)/mlvirsh/mlvirsh_gettext.ml' + -$(RM) '$(CURDIR)/po/Makefile' + -$(RM) '$(CURDIR)/debian/libvirt-ocaml-dev.dirs' + -$(RM) '$(CURDIR)/debian/libvirt-ocaml.dirs' install/libvirt-ocaml-dev:: mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/libvirt/*.so $(DESTDIR)/$(OCAML_DLL_DIR)/ -- ocaml-libvirt packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. bc5664e965a91cf134293d7ec2bb38cb77589dbc
The following commit has been merged in the master branch:
commit c2be8583489b7bcfc18a27a4b90ae99cbfa2dcb6
Author: Sylvain Le Gall <[EMAIL PROTECTED]>
Date: Sat Jun 28 16:59:23 2008 +0200
Update debian/control.
Add myself as uploader, add libvirt-dev as build-deps. Promote Vcs-*
field.
diff --git a/debian/control b/debian/control
index 766844b..b3c7ae7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,17 @@ Source: ocaml-libvirt
Section: libdevel
Priority: extra
Maintainer: Debian Libvirt Maintainers <[EMAIL PROTECTED]>
-Uploaders: Guido Guenther <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>= 6), autotools-dev, libvirt-bin, ocaml-nox,
ocaml-findlib, quilt
+Uploaders: Guido Guenther <[EMAIL PROTECTED]>, Sylvain Le Gall <[EMAIL
PROTECTED]>
+Build-Depends: cdbs, debhelper (>= 6), autotools-dev, libvirt-bin, ocaml-nox,
+ ocaml-findlib, quilt, libvirt-dev
Standards-Version: 3.8.0
+Vcs-Browser:
http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-libvirt.git
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-libvirt.git
Homepage: http://libvirt.org/ocaml/
Package: libvirt-ocaml
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
Description: OCaml bindings for libvirt
This library provides OCaml bindings for using libvirt.
.
@@ -22,7 +25,7 @@ Description: OCaml bindings for libvirt
Package: libvirt-ocaml-dev
Architecture: any
-Depends: libvirt-ocaml (= ${binary:Version})
+Depends: ocaml-nox-${F:OCamlABI}, libvirt-ocaml (= ${binary:Version})
Description: OCaml bindings for libvirt
This library provides OCaml bindings for using libvirt.
.
--
ocaml-libvirt packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. bc5664e965a91cf134293d7ec2bb38cb77589dbc
The following commit has been merged in the master branch: commit 1333df73c8609e6039ca8e30bde27a8a676242db Author: Sylvain Le Gall <[EMAIL PROTECTED]> Date: Sat Jun 28 18:58:23 2008 +0200 Handle byte/opt compilation. Install *.cma in any case and install byte compiled mlvirsh executable when compiling in bytecode. diff --git a/debian/patches/0001-add-destdir.patch b/debian/patches/0001-add-destdir.patch index abc24e1..d1baf32 100644 --- a/debian/patches/0001-add-destdir.patch +++ b/debian/patches/0001-add-destdir.patch @@ -1,8 +1,8 @@ -diff --git a/libvirt/Makefile.in b/libvirt/Makefile.in -index bca1cdf..9cc96f0 100644 a/libvirt/Makefile.in -+++ b/libvirt/Makefile.in -@@ -124,8 +124,15 @@ libvirt.cmi: libvirt.mli +Index: ocaml-libvirt/libvirt/Makefile.in +=== +--- ocaml-libvirt.orig/libvirt/Makefile.in 2008-06-28 18:50:51.0 +0200 ocaml-libvirt/libvirt/Makefile.in 2008-06-28 18:55:32.0 +0200 +@@ -124,8 +124,15 @@ libvirt_version.cmo: libvirt_version.cmi libvirt_version.cmi: libvirt_version.mli @@ -18,14 +18,14 @@ index bca1cdf..9cc96f0 100644 +install-opt: + mkdir -p $(OCAMLDESTDIR) + ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore libvirt \ -+../META *.so *.a *.cmx *.cmxa *.cmi *.mli ++../META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli include ../Make.rules -diff --git a/Makefile.in b/Makefile.in -index da44e9c..8a74647 100644 a/Makefile.in -+++ b/Makefile.in -@@ -27,7 +27,7 @@ OCAMLDOCFLAGS:= -html -sort +Index: ocaml-libvirt/Makefile.in +=== +--- ocaml-libvirt.orig/Makefile.in 2008-06-28 18:50:51.0 +0200 ocaml-libvirt/Makefile.in 2008-06-28 18:55:32.0 +0200 +@@ -27,7 +27,7 @@ SUBDIRS = libvirt mlvirsh examples @@ -34,18 +34,18 @@ index da44e9c..8a74647 100644 for d in $(SUBDIRS); do \ $(MAKE) -C $$d $@; \ if [ $$? -ne 0 ]; then exit 1; fi; \ -@@ -141,4 +141,4 @@ winupload: +@@ -141,4 +141,4 @@ force: .PHONY: all opt depend install clean distclean configure dist check-manifest \ - release release_stage_2 release_stage_3 force \ No newline at end of file + release release_stage_2 release_stage_3 force -diff --git a/examples/Makefile.in b/examples/Makefile.in -index 6fd8093..9bed8ec 100644 a/examples/Makefile.in -+++ b/examples/Makefile.in -@@ -54,6 +54,6 @@ node_info.opt: node_info.cmx +Index: ocaml-libvirt/examples/Makefile.in +=== +--- ocaml-libvirt.orig/examples/Makefile.in2008-06-28 18:50:51.0 +0200 ocaml-libvirt/examples/Makefile.in 2008-06-28 18:55:32.0 +0200 +@@ -54,6 +54,6 @@ $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \ ../libvirt/mllibvirt.cmxa -o $@ $< @@ -53,11 +53,11 @@ index 6fd8093..9bed8ec 100644 +install-opt install-byte: include ../Make.rules -diff --git a/mlvirsh/Makefile.in b/mlvirsh/Makefile.in -index 23d6e1e..779513c 100644 a/mlvirsh/Makefile.in -+++ b/mlvirsh/Makefile.in -@@ -84,7 +84,7 @@ mlvirsh.opt: $(XOBJS) +Index: ocaml-libvirt/mlvirsh/Makefile.in +=== +--- ocaml-libvirt.orig/mlvirsh/Makefile.in 2008-06-28 18:50:51.0 +0200 ocaml-libvirt/mlvirsh/Makefile.in 2008-06-28 18:56:17.0 +0200 +@@ -84,10 +84,16 @@ ../libvirt/mllibvirt.cmxa -o $@ $^ endif @@ -66,3 +66,12 @@ index 23d6e1e..779513c 100644 if [ -x mlvirsh.opt ]; then \ mkdir -p $(DESTDIR)$(bindir); \ $(INSTALL) -m 0755 mlvirsh.opt $(DESTDIR)$(bindir)/mlvirsh; \ + fi + ++install-byte: ++ if [ -x mlvirsh ]; then \ ++mkdir -p $(DESTDIR)$(bindir); \ ++$(INSTALL) -m 0755 mlvirsh $(DESTDIR)$(bindir)/mlvirsh; \ ++ fi ++ + include ../Make.rules diff --git a/debian/rules b/debian/rules index 7a0109f..6db2faf 100755 --- a/debian/rules +++ b/debian/rules @@ -28,11 +28,11 @@ DESTDIR_DEV=$(CURDIR)/debian/libvirt-ocaml-dev DESTDIR=$(CURDIR)/debian/libvirt-ocaml DEB_MAKE_CLEAN_TARGET:= clean +DEB_MAKE_BUILD_TARGET:= all ifeq ($(OCAML_HAVE_OCAMLOPT),yes) -DEB_MAKE_BUILD_TARGET:= opt +DEB_MAKE_BUILD_TARGET+= opt DEB_MAKE_INSTALL_TARGET := install-opt else -DEB_MAKE_BUILD_TARGET:= all DEB_MAKE_INSTALL_TARGET := install-byte endif DEB_MAKE_INSTALL_TARGET += OCAMLDESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" DESTDIR="$(DESTDIR_DEV)" -- ocaml-libvirt packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. bc5664e965a91cf134293d7ec2bb38cb77589dbc
The following commit has been merged in the master branch: commit bc5664e965a91cf134293d7ec2bb38cb77589dbc Author: Sylvain Le Gall <[EMAIL PROTECTED]> Date: Sat Jun 28 19:20:03 2008 +0200 Build and install MO file. diff --git a/debian/rules b/debian/rules index 6db2faf..755c6b1 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,14 @@ DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/mlvirsh.xml DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml \ $(CURDIR)/debian/xml-man/en/refentryinfo.xml +build/libvirt-ocaml:: + $(MAKE) -C '$(CURDIR)/po' all + +install/libvirt-ocaml:: + $(MAKE) -C '$(CURDIR)/po' install PODIR=$(DESTDIR)/usr/share/locale + clean:: + if test -e $(CURDIR)/po/Makefile; then $(MAKE) -C '$(CURDIR)/po' clean; fi -$(RM) '$(CURDIR)/META' -$(RM) '$(CURDIR)/Make.rules' -$(RM) '$(CURDIR)/Makefile' -- ocaml-libvirt packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging annotated tag, debian/0.4.2.4-1, created. debian/0.4.2.4-1
The annotated tag, debian/0.4.2.4-1 has been created at c713ad2aa30e665a0f9767bf3b170bd6ee4ed76d (tag) tagging 19ba46f886c2200269c182770420eb1fff3c300b (commit) tagged by Sylvain Le Gall on Sat Jun 28 19:28:18 2008 +0200 - Shortlog Debian release 0.4.2.4-1 Guido Guenther (3): Imported Upstream version 0.4.2.4 Add debian packaging add ITP bugnumber Sylvain Le Gall (7): Add README.source explaining to use quilt. Remove auto-generated files from source. Update debian/control. Add docbook manpages and possible translation. Handle byte/opt compilation. Build and install MO file. Add changelog entry before uploading. --- -- ocaml-libvirt packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. debian/0.4.2.4-1-1-gd3e1e91
The following commit has been merged in the master branch: commit 19ba46f886c2200269c182770420eb1fff3c300b Author: Sylvain Le Gall <[EMAIL PROTECTED]> Date: Sat Jun 28 19:27:23 2008 +0200 Add changelog entry before uploading. diff --git a/debian/changelog b/debian/changelog index 19f9acf..5cae7a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ ocaml-libvirt (0.4.2.4-1) unstable; urgency=low + [ Guido Guenther ] * Initial release (Closes: #488229) - -- Guido Guenther <[EMAIL PROTECTED]> Thu, 26 Jun 2008 09:42:18 +0200 + [ Sylvain Le Gall ] + * Add manpage for mlvirsh + * Ship *.mo file + -- Sylvain Le Gall <[EMAIL PROTECTED]> Sat, 28 Jun 2008 19:26:14 +0200 -- ocaml-libvirt packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. debian/0.4.2.4-1-1-gd3e1e91
The following commit has been merged in the master branch: commit d3e1e916c1b13636bc1347576c11b46b5d4e3919 Author: Sylvain Le Gall <[EMAIL PROTECTED]> Date: Sat Jun 28 19:28:20 2008 +0200 Add UNRELEASED changelog entry diff --git a/debian/changelog b/debian/changelog index 5cae7a0..8a80791 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-libvirt (0.4.2.4-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Sylvain Le Gall <[EMAIL PROTECTED]> Sat, 28 Jun 2008 19:28:20 +0200 + ocaml-libvirt (0.4.2.4-1) unstable; urgency=low [ Guido Guenther ] -- ocaml-libvirt packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5811 - /trunk/tools/svn2git/glondu_svn2git.py
Author: glondu-guest
Date: Sat Jun 28 17:37:36 2008
New Revision: 5811
URL: http://svn.debian.org/wsvn/?sc=1&rev=5811
Log:
Update committers list
Modified:
trunk/tools/svn2git/glondu_svn2git.py
Modified: trunk/tools/svn2git/glondu_svn2git.py
URL:
http://svn.debian.org/wsvn/trunk/tools/svn2git/glondu_svn2git.py?rev=5811&op=diff
==
--- trunk/tools/svn2git/glondu_svn2git.py (original)
+++ trunk/tools/svn2git/glondu_svn2git.py Sat Jun 28 17:37:36 2008
@@ -24,8 +24,18 @@
users_dict = {
"glondu-guest": ("Stephane Glondu", "[EMAIL PROTECTED]"),
"smimram": ("Samuel Mimram", "[EMAIL PROTECTED]"),
+"smimram-guest": ("Samuel Mimram", "[EMAIL PROTECTED]"),
"zack": ("Stefano Zacchiroli", "[EMAIL PROTECTED]"),
"gareuselesinge": ("Enrico Tassi", "[EMAIL PROTECTED]"),
+"treinen": ("Ralf Treinen", "[EMAIL PROTECTED]"),
+"gildor": ("Sylvain Le Gall", "[EMAIL PROTECTED]"),
+"toots": ("Romain Beauxis", "[EMAIL PROTECTED]"),
+"jcristau": ("Julien Cristau", "[EMAIL PROTECTED]"),
+"jcristau-guest": ("Julien Cristau", "[EMAIL PROTECTED]"),
+"luther": ("Sven Luther", "[EMAIL PROTECTED]"),
+"jerome": ("Jerome Marant", "[EMAIL PROTECTED]"),
+"ecc-guest": ("Eric Cooper", "[EMAIL PROTECTED]"),
+"mfurr": ("Mike Furr", "[EMAIL PROTECTED]")
}
@@ -70,7 +80,8 @@
def __init__(self, logentry, svn2git):
self.svn2git = svn2git
self.rev = int(logentry.getAttribute("revision"))
-self.msg = logentry.getElementsByTagName("msg")[0].firstChild.nodeValue
+msg_elt = logentry.getElementsByTagName("msg")[0].firstChild
+self.msg = msg_elt and msg_elt.nodeValue or "No log message"
user_elt = logentry.getElementsByTagName("author")[0]
self.name, self.email = users_dict[user_elt.firstChild.nodeValue]
date_elt = logentry.getElementsByTagName("date")[0]
@@ -197,11 +208,11 @@
self.repos =
"svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/%s" % package
self.tagrepos =
"svn://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/%s" % package
# Retrieve history
-r = run_command("svn", "svn log --xml %s" % self.repos)
+r = run_command("svn", "svn log -v --xml %s" % self.repos)
r = parseString(r).getElementsByTagName("logentry")
revs = [GitCommit(x, self) for x in r]
# Retrieve tags
-r = run_command("svn", "svn log --xml %s" % self.tagrepos)
+r = run_command("svn", "svn log -v --xml %s" % self.tagrepos)
r = parseString(r).getElementsByTagName("logentry")
tags = [GitTag(x, self) for x in r]
# Merge and sort tags
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] r5812 - in /trunk/projects/approx/trunk: approx.ml debian/changelog doc/README.concurrency server.ml util.ml
Author: ecc-guest
Date: Sat Jun 28 18:33:46 2008
New Revision: 5812
URL: http://svn.debian.org/wsvn/?sc=1&rev=5812
Log:
fix race condition when opening cache files
use hints to avoid duplicate downloads
update concurrency document to reflect new scheme
fix local file URLs
Modified:
trunk/projects/approx/trunk/approx.ml
trunk/projects/approx/trunk/debian/changelog
trunk/projects/approx/trunk/doc/README.concurrency
trunk/projects/approx/trunk/server.ml
trunk/projects/approx/trunk/util.ml
Modified: trunk/projects/approx/trunk/approx.ml
URL:
http://svn.debian.org/wsvn/trunk/projects/approx/trunk/approx.ml?rev=5812&op=diff
==
--- trunk/projects/approx/trunk/approx.ml (original)
+++ trunk/projects/approx/trunk/approx.ml Sat Jun 28 18:33:46 2008
@@ -38,29 +38,30 @@
let stat_file name = try Some (stat name) with Unix_error _ -> None
-(* Temporary name in case the download is interrupted *)
-
-let in_progress name = name ^ ".tmp"
+(* Hint that a download is in progress *)
+
+let in_progress name = name ^ ".hint"
let wait_for_download_in_progress name =
- let name' = in_progress name in
- let rec wait n prev =
-match stat_file name' with
-| Some { st_size = cur } ->
-if cur = prev && n = max_wait then begin
+ let hint = in_progress name in
+ let timeout = float_of_int max_wait in
+ let rec wait n =
+match stat_file hint with
+| Some { st_mtime = mtime } ->
+if time () -. mtime > timeout then begin
error_message "Concurrent download of %s is taking too long" name;
- (* remove the other process's .tmp file if it still exists,
+ (* remove the other process's hint file if it still exists,
so we can create our own *)
- rm name'
+ rm hint
end else begin
- if prev = 0L then
+ if n = 0 then
debug_message "Waiting for concurrent download of %s" name;
sleep 1;
- wait (if cur = prev then n + 1 else 0) cur
+ wait (n + 1)
end
| None -> ()
in
- wait 0 0L
+ wait 0
let debug_headers msg headers =
debug_message "%s" msg;
@@ -83,7 +84,6 @@
debug_headers "Local response" env#output_header_fields;
Done (`File (`Ok, None, cache_dir ^/ name, 0L, size))
-let not_found = Done (`Std_response (`Not_found, None, None))
let not_modified = Done (`Std_response (`Not_modified, None, None))
let cache_hit name ims mod_time env =
@@ -97,6 +97,8 @@
end
else Missing
+let not_found = Done (`Std_response (`Not_found, None, None))
+
let deny name =
debug_message "Denying %s" name;
not_found
@@ -144,10 +146,11 @@
| "" :: dirs -> loop "/" dirs
| dirs -> loop "." dirs
-let create_file path =
- make_directory (Filename.dirname path);
- (* open file exclusively so we don't conflict with a concurrent download *)
- open_out_excl path
+let create_hint name =
+ make_directory (Filename.dirname name);
+ close (openfile (in_progress name) [O_CREAT; O_WRONLY] 0o644)
+
+let remove_hint name = rm (in_progress name)
type cache_info = { file : string; tmp_file : string; chan : out_channel }
@@ -169,8 +172,9 @@
end else
try
debug_message " open cache %s" file;
- let tmp_file = in_progress file in
- let chan = create_file tmp_file in
+ make_directory (Filename.dirname file);
+ let tmp_file = gensym file in
+ let chan = open_out_excl tmp_file in
Cache { file = file; tmp_file = tmp_file; chan = chan }
with e ->
error_message "Cannot cache %s" file;
@@ -378,7 +382,13 @@
| Url.FTP | Url.FILE -> download_ftp
in
let resp = new_response url name in
- try dl resp url name ims cgi
+ let download_with_hint () =
+create_hint name;
+unwind_protect
+ (fun () -> dl resp url name ims cgi)
+ (fun () -> remove_hint name)
+ in
+ try download_with_hint ()
with e ->
remove_cache resp.cache;
if e <> Failure url then info_message "%s" (string_of_exception e);
Modified: trunk/projects/approx/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/trunk/projects/approx/trunk/debian/changelog?rev=5812&op=diff
==
--- trunk/projects/approx/trunk/debian/changelog (original)
+++ trunk/projects/approx/trunk/debian/changelog Sat Jun 28 18:33:46 2008
@@ -1,3 +1,13 @@
+approx (3.3.0) unstable; urgency=low
+
+ * Allow empty host name in file URLs (closes: #479022)
+ * Use unique temporary names to avoid race condition
+when opening cache files (closes: #488080)
+ * Use hint files to avoid (but not eliminate) duplicate downloads
+ * Remove unnecessary getpeername call in server loop
+
+ -- Eric Cooper <[EMAIL PROTECTED]> Sat, 03 May 2008 16:43:25 -0400
+
approx (3.2.0) unstable; urgency=low
* Listen on both IPv4 and IPv6 sockets when available
Modified: trunk/projects
[Pkg-ocaml-maint-commits] r5813 - /tags/projects/approx/3.3.0/
Author: ecc-guest Date: Sat Jun 28 18:55:22 2008 New Revision: 5813 URL: http://svn.debian.org/wsvn/?sc=1&rev=5813 Log: [svn-buildpackage] Tagging approx (3.3.0) Added: tags/projects/approx/3.3.0/ - copied from r5812, trunk/projects/approx/trunk/ ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
