diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-12 10:16:27 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-12 10:16:27 -0700 |
| commit | 8e83a3bea2fea4c2a1dcc4a4fd427542a1c6ae79 (patch) | |
| tree | eb21b39e04cff866f0eef48fa4792c36c0b29914 | |
| parent | f28aa7e12bd105f65167454244e66de168a3f399 (diff) | |
| parent | cb0f831834ec9f3b38e5fbef87c1a9583e24f8bb (diff) | |
| download | ceph-8e83a3bea2fea4c2a1dcc4a4fd427542a1c6ae79.tar.gz | |
Merge remote-tracking branch 'gh/next'
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rwxr-xr-x | src/ceph.in | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3762107bfe9..cdbf187035a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,7 @@ bin_PROGRAMS = bin_DEBUGPROGRAMS = sbin_PROGRAMS = # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin -ceph_sbindir = $(prefix)$(sbindir) +ceph_sbindir = $(exec_prefix)$(sbindir) ceph_sbin_SCRIPTS = \ ceph-disk \ ceph-disk-prepare \ diff --git a/src/ceph.in b/src/ceph.in index 0c83bb82036..1118d6cba93 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -708,11 +708,12 @@ def main(): return ret # this assumes outs never has useful command output, only status - if outs: - if compat and ret == 0: + if compat: + if ret == 0: # old cli/mon would send status string to stdout on non-error print outs - else: + else: + if outs: print >> sys.stderr, prefix + outs if (parsed_args.output_file): |