diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
| commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
| tree | c1d4adcda7f0b767537620aea02633158e17218a /community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch | |
| parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
| parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch')
| -rw-r--r-- | community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch deleted file mode 100644 index 40dd48b42..000000000 --- a/community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3f6b2390102ea9d808c7075b5aaeec743b7d104e Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 10 Apr 2012 19:30:35 -0500 -Subject: [PATCH 1/2] Backport for mongodb 2.0.4 "Ignore --fork and --logpath - when using --shutdown SERVER-5186 SERVER-5187" - -https://github.com/mongodb/mongo/commit/fa2e2ef95c5c934eef63fff4b98d5eb060c5653923 - -Backported in preparation for backporting the fix for https://jira.mongodb.org/browse/SERVER-5358 ---- - db/cmdline.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/db/cmdline.cpp b/db/cmdline.cpp -index fd759a7..346a9ae 100644 ---- a/db/cmdline.cpp -+++ b/db/cmdline.cpp -@@ -239,7 +239,7 @@ namespace mongo { - cmdLine.noUnixSocket = true; - } - -- if (params.count("fork")) { -+ if (params.count("fork") && !params.count("shutdown")) { - if ( ! params.count( "logpath" ) ) { - cout << "--fork has to be used with --logpath" << endl; - ::exit(-1); -@@ -304,7 +304,7 @@ namespace mongo { - } - - #endif -- if (params.count("logpath")) { -+ if (params.count("logpath") && !params.count("shutdown")) { - if ( logpath.size() == 0 ) - logpath = params["logpath"].as<string>(); - uassert( 10033 , "logpath has to be non-zero" , logpath.size() ); --- -1.7.10 - |