Changeset 3516 for trunk

Timestamp:

Jul 4, 2007, 4:08:15 AM (18 years ago)

Author:

bird

Message:

Some OS/2 hacks and a fix for the simplified Os/2 logging.

Location:

trunk/essentials/sys-apps/prefix-portage

Files:

• kNIX-bootstrap.kmk (modified) (1 diff)
• pym/portage/__init__.py (modified) (2 diffs)
• pym/portage/dbapi/porttree.py (modified) (1 diff)
• pym/portage/news.py (modified) (2 diffs)

trunk/essentials/sys-apps/prefix-portage/kNIX-bootstrap.kmk

@@ -425 +425 @@
 endif
         $(APPEND) $@ 'CXXFLAGS="$${CFLAGS}"'
-        $(APPEND) $@ 'PORTDIR_OVERLAY="$(PATH_ROOT)/kNIXPortage $(PATH_ROOT)/prefix-overlay"'
+        $(APPEND) $@ '## @todo Figure why this ain't working while the next works...'
+        $(APPEND) $@ '#PORTDIR_OVERLAY="$(PATH_ROOT)/kNIXPortage $(PATH_ROOT)/prefix-overlay"'
+        $(APPEND) $@ 'PORTDIR_OVERLAY="$(PATH_ROOT)/kNIXPortage"'
         $(APPEND) $@ 'GENTOO_MIRRORS="ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo http://128.213.5.34/gentoo http://mirrors.tds.net/gentoo http://mirror.datapipe.net/gentoo"'
         $(APPEND) $@ 'USE="-nls"'

trunk/essentials/sys-apps/prefix-portage/pym/portage/__init__.py

@@ -2373 +2373 @@
                 # bird: XXX: pty and termios.tcgetattr doesn't work/exist on OS/2 yet.
                 if sys.platform == "os2knix":
-                        pr, pw = os.pipe()
+                        (pr, pw) = os.pipe()
                         fd_pipes.setdefault(0, sys.stdin.fileno())
                         mypids.extend(portage.process.spawn(('tee', '-i', '-a', logfile),
@@ -2380 +2380 @@
                         fd_pipes[1] = pw
                         fd_pipes[2] = pw
+                        output_pid = mypids[-1]
+                        slave_fd = pw
                         keywords["fd_pipes"] = fd_pipes
                 else:

trunk/essentials/sys-apps/prefix-portage/pym/portage/dbapi/porttree.py

@@ -131 +131 @@
                 try:
                         for mydir in (self.depcachedir,):
+                                # bird: XXX: doesn't quite work, so skip it for now.
+                                if sys.platform == "os2knix":
+                                        continue
                                 if ensure_dirs(mydir, gid=portage_gid, mode=dirmode, mask=modemask):
                                         writemsg("Adjusting permissions recursively: '%s'\n" % mydir,

trunk/essentials/sys-apps/prefix-portage/pym/portage/news.py

@@ -123 +123 @@
                 if update:
                         self.updateItems(repoid)
-                
                 unreadfile = os.path.join(self.UNREAD_PATH, "news-"+repoid+".unread")
                 try:
@@ -133 +132 @@
                                         
                                 if os.path.exists(unreadfile):
-                                        unread = open(unreadfile).readlines()
+                                        # bird: XXX: set file mode or something fails somewhere in readlines.
+                                        import sys
+                                        if sys.platform == "os2knix":
+                                                import errno
+                                                try:
+                                                        unread = open(unreadfile, "r+").readlines()
+                                                except IOError, e:
+                                                        unread = ""
+                                                        pass
+                                        else:
+                                                unread = open(unreadfile).readlines()
                                         if len(unread):
                                                 return len(unread)