Check-in [d78530f5d6]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:d78530f5d63f4102ed341b4cef2c11252a5ab9bd
Date: 2013-02-25 12:29:39
User: root
Comment:fixed deps error in debdb2pupdb

Tags And Properties
Changes

Changes to woof-arch/arm/build/support/debdb2pupdb

cannot compute difference between binary files

Changes to woof-arch/x86/build/support/debdb2pupdb

cannot compute difference between binary files

Changes to woof-code/support/debdb2pupdb.bac

@@ -8,10 +8,11 @@
 REM 121112 significant speedup, no longer call find_cat. loads categories.dat. 121113 tidy up.
 REM 121113 read Ubuntu-db 'Section' parameter to help assign category.
 REM 121113 last field of ubuntu pkg db cannot be guaranteed. introduce STARTMARKER (refer 0setup).
 REM 130126 no longer find category. find_cat is called afterward (see 0setup).
 REM 130221 forgot &gt deps case.
+REM 130225 awkward situation, "|" OR operator gets converted to a space back in prefiltering in 0setup.
 
 REM declare an associative array, containing strings...
 DECLARE assocarray$ ASSOC STRING
 assocarray$("Description")=""
 assocarray$("Filename")=""
@@ -177,37 +178,45 @@
           CASE "(="
            relation$="&eq"
           DEFAULT
            relation$=""
          END SELECT
-         REM for compatibility with earlier, have to strip leading and trailing stuff...
-         REM remove leading...
-         revver1$=REVERSE$(depverarray$[1])
-         pos1=REGEX(revver1$,":[0-9]$")
-         IF pos1 = 0 THEN
-          ver2$=depverarray$[1]
+
+         REM 130225 awkward situation, "|" OR operator gets converted to a space back in prefiltering in 0setup, so
+         REM an original: Depends: libc6 (>= 2.3.4), udev | makedev (>= 2.3.1-24)
+         REM gets passed in here as: Depends|libc6 (>= 2.3.4), udev makedev (>= 2.3.1-24)
+         IF relation$ = "" THEN
+          depver$=""
          ELSE
-          revver2$=LEFT$(revver1$,pos1-1)
-          ver2$=REVERSE$(revver2$)
-         END IF
-         REM remove trailing...
-         REM note: could use compatdistro$ for improved efficiency...
-         pos1=REGEX(ver2$,"\\-[0-9.]*ubuntu[0-9.]*$")
-         IF pos1=0 THEN pos1=REGEX(ver2$,"\\+[0-9.]*ubuntu[0-9.]*$")
-         IF pos1=0 THEN pos1=REGEX(ver2$,"\\-[0-9.]*debian[0-9.]*$")
-         IF pos1=0 THEN pos1=REGEX(ver2$,"\\+[0-9.]*debian[0-9.]*$")
-         IF pos1=0 THEN pos1=REGEX(ver2$,"\\-[0-9.]*raspbian[0-9.]*$")
-         IF pos1=0 THEN pos1=REGEX(ver2$,"\\+[0-9.]*raspbian[0-9.]*$")
-         IF pos1=0 THEN pos1=REGEX(ver2$,"\\-[0-9.]*build[0-9.]*$")
-         IF pos1=0 THEN pos1=REGEX(ver2$,"\\+[0-9.]*build[0-9.]*$")
-         IF pos1 = 0 THEN
-          ver2b$=ver2$
-         ELSE
-          ver2b$=LEFT$(ver2$,pos1-1)
-         END IF
-         depver$=CONCAT$(relation$,ver2b$)
-         REM depver$ ex: "&ge2.15"
+          REM for compatibility with earlier, have to strip leading and trailing stuff...
+          REM remove leading...
+          revver1$=REVERSE$(depverarray$[1])
+          pos1=REGEX(revver1$,":[0-9]$")
+          IF pos1 = 0 THEN
+           ver2$=depverarray$[1]
+          ELSE
+           revver2$=LEFT$(revver1$,pos1-1)
+           ver2$=REVERSE$(revver2$)
+          END IF
+          REM remove trailing...
+          REM note: could use compatdistro$ for improved efficiency...
+          pos1=REGEX(ver2$,"\\-[0-9.]*ubuntu[0-9.]*$")
+          IF pos1=0 THEN pos1=REGEX(ver2$,"\\+[0-9.]*ubuntu[0-9.]*$")
+          IF pos1=0 THEN pos1=REGEX(ver2$,"\\-[0-9.]*debian[0-9.]*$")
+          IF pos1=0 THEN pos1=REGEX(ver2$,"\\+[0-9.]*debian[0-9.]*$")
+          IF pos1=0 THEN pos1=REGEX(ver2$,"\\-[0-9.]*raspbian[0-9.]*$")
+          IF pos1=0 THEN pos1=REGEX(ver2$,"\\+[0-9.]*raspbian[0-9.]*$")
+          IF pos1=0 THEN pos1=REGEX(ver2$,"\\-[0-9.]*build[0-9.]*$")
+          IF pos1=0 THEN pos1=REGEX(ver2$,"\\+[0-9.]*build[0-9.]*$")
+          IF pos1 = 0 THEN
+           ver2b$=ver2$
+          ELSE
+           ver2b$=LEFT$(ver2$,pos1-1)
+          END IF
+          depver$=CONCAT$(relation$,ver2b$)
+          REM depver$ ex: "&ge2.15"
+         END IF
         END IF
        END IF
       END IF
       len6=LEN(depname$)
       IF len6 NE 0 THEN