Changeset 723 for packaging/lib.wis.tpl

Timestamp:

Apr 30, 2010, 10:21:42 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Fixed GetPkgVersion(): make sure the package is not searched in other INIs after it is found.

File:

• packaging/lib.wis.tpl (modified) (9 diffs)

packaging/lib.wis.tpl

@@ -72 +72 @@
         rc = rxFuncAdd('SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs')
         rc = SysLoadFuncs()
-        ver = ''
         WarpInDir = strip(SysIni('USER', 'WarpIN', 'Path'), 'T', '0'x)
         if (WarpInDir \== '') then do
@@ -86 +85 @@
                                 ver = right(apps.j, length(apps.j) - length(aPkgId) - 1)
                                 ver = translate(ver, '.', '\')
-                                leave
+                                return ver
                             end
                         end
@@ -93 +92 @@
             end
         end
-        return ver
+        return ''
 </REXX>
 
@@ -111 +110 @@
         rc = rxFuncAdd('SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs')
         rc = SysLoadFuncs()
-        ver = ''
         WarpInDir = strip(SysIni('USER', 'WarpIN', 'Path'), 'T', '0'x)
         if (WarpInDir \== '') then do
@@ -125 +123 @@
                                 ver = right(apps.j, length(apps.j) - length(aPkgId) - 1)
                                 ver = translate(ver, '.', '\')
-                                leave
+                                return ver
                             end
                         end
@@ -132 +130 @@
             end
         end
-        return ver
+        return ''
 </REXX>
 
@@ -147 +145 @@
         rc = rxFuncAdd('SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs')
         rc = SysLoadFuncs()
-        ver = ''
         WarpInDir = strip(SysIni('USER', 'WarpIN', 'Path'), 'T', '0'x)
         if (WarpInDir \== '') then do
@@ -161 +158 @@
                                 ver = right(apps.j, length(apps.j) - length(aPkgId) - 1)
                                 ver = translate(ver, '.', '\')
-                                leave
+                                return ver
                             end
                         end
@@ -168 +165 @@
             end
         end
-        return ver
+        return ''
 </REXX>