summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2009-02-16 13:30:18 +0100
committerMark Wielaard <mjw@redhat.com>2009-02-16 13:30:18 +0100
commitbf611ccca84bc4a49de8444303540dd778e0e50c (patch)
tree00dbdd59249b2ef319383eec73758ba7c60d0b6d
parente3c5bcd9d838731926fa72d652c29c7ba0eb332a (diff)
downloadsystemtap-steved-bf611ccca84bc4a49de8444303540dd778e0e50c.tar.gz
systemtap-steved-bf611ccca84bc4a49de8444303540dd778e0e50c.tar.xz
systemtap-steved-bf611ccca84bc4a49de8444303540dd778e0e50c.zip
PR 9851, use os.path.splitext instead of string.replace.
-rw-r--r--ChangeLog5
-rwxr-xr-xdtrace5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f48bb2eb..f650f4fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-02-16 Mark Wielaard <mjw@redhat.com>
+ PR 9851
+ * dtrace: Use os.path.splitext instead of string.replace.
+
+2009-02-16 Mark Wielaard <mjw@redhat.com>
+
PR 9849
* dtrace: Use mkstemp.
diff --git a/dtrace b/dtrace
index d62279f8..15c85aeb 100755
--- a/dtrace
+++ b/dtrace
@@ -124,7 +124,7 @@ if (build_header == False and build_source == False):
if (filename == ""):
if (s_filename != ""):
- filename = s_filename.replace(".d","")
+ (filename,ext) = os.path.splitext(s_filename)
if (build_header):
filename = filename + ".h"
elif (build_source):
@@ -137,7 +137,8 @@ if (build_header):
providers = provider()
providers.open(s_filename, filename)
elif (build_source):
- basename = os.path.basename(s_filename).replace(".d", ".c")
+ (basename,ext) = os.path.splitext(s_filename)
+ basename = os.path.basename(basename)
(d,fn) = mkstemp(suffix=".c",prefix=basename)
f = open(fn,mode='w')
f.write("static __dtrace () {}\n")