[yum-cvs] 2 commits - yum/rpmtrans.py

[Seth Vidal]

 yum/rpmtrans.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96bb0b8780c3ed921dd9d962a24560edc1b74cb1
Merge: 18c55f4... b635ac2...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Oct 18 09:35:22 2007 -0400

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      Added missing imports
      Added a cleanup edition of a DownloadBaseCallback to make it simple to create custom download progress handlers.

commit 18c55f481ad1c5edcc70afaef41414c1b8963f7f
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Oct 18 09:12:08 2007 -0400

    apply patch from Christoph Thiel for suse's rpm handling scriptFd setting

diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index a3cb203..05d7fbd 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -165,7 +165,7 @@ class RPMTransaction:
                     fcntl.fcntl(self._readpipe.fileno(),
                                 fcntl.F_GETFL) | os.O_NONBLOCK)
         self._writepipe = os.fdopen(w, 'w')
-        self.base.ts.ts.scriptFd = self._writepipe.fileno()
+        self.base.ts.scriptFd = self._writepipe.fileno()
         rpm.setVerbosity(rpm.RPMLOG_INFO)
         rpm.setLogFile(self._writepipe)