- fix mknod

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9240f30e7..27c0928b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-31  Peter Jones  <pjones@redhat.com>
+
+	* isys/isys.py (makedev): return the computed value
+
+	* command-stubs/mknod-stub: use os.makedev, not the deprecated isys one
+
 2006-07-31  David Cantrell  <dcantrell@redhat.com>
 
 	* loader2/ftp.c (getHostAddress): Use mygethostbyname() (BZ #200771).
diff --git a/command-stubs/mknod-stub b/command-stubs/mknod-stub
index f4239c75d..f15c618bf 100755
--- a/command-stubs/mknod-stub
+++ b/command-stubs/mknod-stub
@@ -5,6 +5,7 @@ sys.path.append('/usr/lib/anaconda')
 import isys
 import string
 import stat
+import os
 
 def usage():
     sys.stderr.write("Usage: %s <path> [b|c] <major> <minor> or\n" %(sys.argv[0],))
@@ -47,7 +48,7 @@ def main():
     minor = int(sys.argv[4])
     path = sys.argv[1]
     
-    isys.mknod(path, 0644 | type, isys.makedev(major, minor))
+    isys.mknod(path, 0644 | type, os.makedev(major, minor))
 
 if __name__ == "__main__":
     main()
diff --git a/isys/isys.py b/isys/isys.py
index 68135cb23..f03684b51 100644
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -380,7 +380,7 @@ def makeDevInode(name, fn=None):
 def makedev(major, minor):
     warnings.warn("isys.makedev is deprecated.  Use os.makedev instead.",
                   DeprecationWarning, stacklevel=2)
-    os.makedev(major, minor)
+    return os.makedev(major, minor)
 
 def mknod(pathname, mode, dev):
     warnings.warn("isys.mknod is deprecated.  Use os.mknod instead.",