Changeset 1299 for spec/trunk/SPECS

Timestamp:

Feb 20, 2018, 10:30:55 AM (8 years ago)

Author:

herwigb

Message:

spec: os2-rpm: Release version 0-6.

Location:

spec/trunk/SPECS

Files:

• os2-rpm.spec (modified) (3 diffs)
• os2-rpm/warpin-conflicts.cmd (modified) (4 diffs)
• os2-rpm/wpi4rpm.cmd (modified) (10 diffs)
• os2-rpm/wps-object.cmd (modified) (20 diffs)

spec/trunk/SPECS/os2-rpm.spec

@@ -2 +2 @@
 Name: os2-rpm
 Version: 0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Development/System
@@ -13 +13 @@
 
 Provides: system-rpm-config = %{version}-%{release}
+Provides: wpi4rpm
 
 BuildRequires: rexx_exe
@@ -82 +83 @@
 
 %changelog
+* Tue Feb 20 2018 Herwig Bauernfeind <herwig.bauernfeind@bitwiseworks.com> 0-6
+- Unify format of error messages from wps-object, warpin-conflicts and wpi4rpm
+- Integrate wpi4rpm into os2-rpm
+
 * Wed Oct 4 2017 Dmitriy Kuminov <coding@dmik.org> 0-5
 - Work around kLIBC bug #379 when unzipping archives with long file names

spec/trunk/SPECS/os2-rpm/warpin-conflicts.cmd

@@ -12 +12 @@
  *
  * Author: Dmitriy Kuminov
- *
+ * Version: 1.3 - 2018-02-19 (Herwig Bauernfeind)
+ *   - Shorten and apply common style to error messages to make the readable
+ *     for ANPM
  * Version: 1.2 - 2012-02-08
  *   - Use WIC -p to get the Package version. This should solve infamous random
@@ -89 +91 @@
     if (ver == '') then exit 0
 
-    say; say 'ERROR:'; say
-    say 'The following WPI package installed on your system conflicts with the'
-    say 'RPM package being installed:'; say
-    say '  'packages.i' (version 'ver')'; say
-    say 'You cannot have both the WPI and the RPM package installed at the same'
-    say 'time. Please de-install the specified WPI package using the WarpIn utility'
-    say 'and try again.'; say
+    say 'ERROR: warpin-conflicts: Please, uninstall WarpIN 'packages.i' (Version 'ver')'
     exit 1
 
@@ -139 +135 @@
             if (wic_ver \= '' & rc == 0) then return ver
             if (rc == 5636) then do
-                say; say 'ERROR:'; say
-                say 'Failed to query the WarpIn database because the WarpIn application'
-                say 'is already running.'; say
-                say 'Please close the WarpIn application and try again.'; say
+                say 'ERROR: warpin-conflicts: Please close the WarpIn application and try again.'
                 exit 5
             end
             else if (rc \= 0) then do
-                say; say 'ERROR:'; say
-                say 'Failed to access the WarpIn database. Executing the program'; say
-                say '  'wic_exe; say
-                say 'failed with exit code 'rc'. Please make sure that the WarpIn'
-                say 'application is installed correctly and try again.'; say
+                say 'ERROR: warpin-conflicts: Executing the program 'wic_exe' failed with exit code 'rc
                 exit 5
             end
@@ -171 +160 @@
                 end
                 else do
-                    say; say 'ERROR:'; say
-                    say 'Failed to access the WarpIn database file:'; say
-                    say '  'inis.i; say
-                    say 'Please close the WarpIn application or, if it is not running, make sure'
-                    say 'that this file is not locked by another process, and try again.'; say
+                    say 'ERROR: warpin-conflicts: Failed to access the WarpIn database file 'inis.i
                     exit 5
                 end

spec/trunk/SPECS/os2-rpm/wpi4rpm.cmd

@@ -1 +1 @@
 /* WPI4RPM */
-ScriptVer = '0.9.7.0'
+ScriptVer = '0.9.8.0'
 
 /*  Synopsis:
@@ -7 +7 @@
     sure RPM/YUM/ANPM installed packages keep dependent WPI packages happy.
    
-    (c) 2017 Herwig Bauernfeind for bww bitwise works GmbH.
+    (c) 2017-2018 Herwig Bauernfeind for bww bitwise works GmbH.
 
     This program is free software: you can redistribute it and/or modify
@@ -37 +37 @@
 Mode      = strip(word(arguments,1))
 if words(Mode) > 1 then do
-    say "wpi4rpm: Parameter parsing error. Aborting..."
+    say "ERROR: wpi4rpm: Parameter parsing error. Aborting..."
     exit -1
 end
@@ -43 +43 @@
 
 if Mode = "ADD" | Mode = "DEL" then do
-    if verbose then say 'wpi4rpm: Mode = "'Mode'"'
+    if verbose then say 'INFO:  wpi4rpm: Mode = "'Mode'"'
     cversion  = word(arguments,words(arguments))
     pRApp     = substr(arguments,length(mode)+2,length(arguments)-(length(mode)+1)-(length(cversion)+1))
@@ -74 +74 @@
 end
 else do
-    say 'WPI4RPM Version 'ScriptVer' (c) 2017 Herwig Bauernfeind for bww bitwise works GmbH.'
+    say 'WPI4RPM Version 'ScriptVer' (c) 2017-2018 Herwig Bauernfeind for bww bitwise works GmbH.'
     say 
     say '  Adds or removes dummy WPI packages to WarpIN database.'
@@ -100 +100 @@
 select 
     when WarpINbas.0 = 0 then do
-        if verbose then say 'wpi4rpm: WarpINPath = "'WarpINPath'"'
-        say "wpi4rpm: No WarpIN database found."
+        if verbose then say 'INFO:  wpi4rpm: WarpINPath = "'WarpINPath'"'
+        say "ERROR: wpi4rpm: No WarpIN database found."
         exit -2
     end
     when WarpINbas.0 > 1 then do
-        if verbose then say 'wpi4rpm: WarpINPath = "'WarpINPath'"'
-        say "wpi4rpm: WARNING: "WarpINbas.0" WarpIN databases found. Using "WarpINbas.1
+        if verbose then say 'INFO:  wpi4rpm: WarpINPath = "'WarpINPath'"'
+        say "ERROR: wpi4rpm: Warning: "WarpINbas.0" WarpIN databases found. Using "WarpINbas.1
         DatBas = WarpINbas.1
     end
@@ -114 +114 @@
 ok = SysIni(DatBas,"ALL:",WarpINApps.)
 if datatype(WarpINApps.0) <> "NUM" then do
-    if verbose then say 'wpi4rpm: Could not open WarpIN database "'datbas'".'
-    say 'wpi4rpm: Please, close WarpIN and reinstall "'RApp'" again.'
+    if verbose then say 'ERROR: wpi4rpm: Could not open WarpIN database "'datbas'".'
+    say 'ERROR: wpi4rpm: Please, close WarpIN and reinstall "'RApp'" again.'
     exit -3
 end
@@ -122 +122 @@
 select
     when Mode = "ADD" then do
-        if verbose then say 'wpi4rpm: "'Datbas'" will be used.'
+        if verbose then say 'INFO:  wpi4rpm: "'Datbas'" will be used.'
         InstTime = time()
         InstDate = date('S')
@@ -142 +142 @@
         ok = SysIni(DatBas, AppString, "TargetPath", "DEV\NULL"||"00"x)
         ok = SysIni(DatBas, AppString, "WIPackHeader",copies("00"x,16)||"Pck001"||copies("00"x,26))
-        if verbose then say 'wpi4rpm: "'Appstring'" added.'
+        if verbose then say 'INFO:  wpi4rpm: "'Appstring'" added.'
         exit ok
     end
     when mode = "DEL" then do
-        if verbose then say 'wpi4rpm: "'Datbas'" will be used.'
+        if verbose then say 'INFO:  wpi4rpm: "'Datbas'" will be used.'
         do I = 1 to WarpINApps.0
             parse var WarpINApps.I WVendor '\' WApp '\' WPackage '\' WMV '\' WLV '\' WBL '\' WRV
             if WarpINapps.I = appstring then do
                 ok = SysIni(DatBas, WarpINApps.I, "DELETE:")
-                if verbose then say 'wpi4rpm: "'WarpINApps.I'" removed.'
+                if verbose then say 'INFO:  wpi4rpm: "'WarpINApps.I'" removed.'
                 leave
             end
         end
         if I > WarpINApps.0 then do
-            if verbose then say 'wpi4rpm: "'AppString'" not found.'
+            if verbose then say 'ERROR: wpi4rpm: "'AppString'" not found.'
             exit -4
         end
     end
     otherwise do
-        say "wpi4rpm: Unknown command invoked."
-        say "wpi4rpm: Run wpi4rpm help (or /? or /H or -h or --help) to learn about usage."
+        say "ERROR: wpi4rpm: Unknown command invoked. Run wpi4rpm help to learn about usage."
     end
 end
@@ -169 +168 @@
 
 errorhandler:
-    say "wpi4rpm: An error occured in line "sigl
-    say "wpi4rpm: "left(strip(sourceline(sigl)),66)'...'
-    say "wpi4rpm: Run wpi4rpm help (or /? or /H or -h or --help) to learn about usage."
+    say "ERROR: wpi4rpm: An error occured in line "sigl" "left(strip(sourceline(sigl)),40)'...'
 exit 255

spec/trunk/SPECS/os2-rpm/wps-object.cmd

@@ -119 +119 @@
         when (cmd == '/DELETEALL') then cmd = 'DA'
         otherwise do
-            say 'ERROR: Invalid command "'G.Args.1'".'
+            say 'ERROR: wps-object: Invalid command "'G.Args.1'".'
             return 1
         end
@@ -125 +125 @@
 
     if (G.Args.0 < 2) then do
-        say 'ERROR: Missing package name.'
+        say 'ERROR: wps-object: Missing package name.'
         return 1
     end
@@ -137 +137 @@
     else if (cmd == 'C' | cmd == 'D') then do
         if (G.Args.0 < 3) then do
-            say 'ERROR: Missing object ID.'
+            say 'ERROR: wps-object: Missing object ID.'
             return 1
         end
@@ -148 +148 @@
             else if (G.Args.0 >= 4) then spec = G.Args.4
             if (spec == '') then do
-                say 'ERROR: Missing object specification.'
+                say 'ERROR: wps-object: Missing object specification.'
                 return 1
             end
@@ -154 +154 @@
 
         if (verify(id, G.InvalidObjectIDChars, 'M') > 0) then do
-            say 'ERROR: Object ID "'id'" contains invalid characters.'
+            say 'ERROR: wps-object: Object ID "'id'" contains invalid characters.'
             return 1
         end
@@ -161 +161 @@
     ux = value('UNIXROOT',,'OS2ENVIRONMENT')
     if (ux == '') then do
-        say 'ERROR: UNIXROOT environment variable is not set.'
+        say 'ERROR: wps-object: UNIXROOT environment variable is not set.'
         return 1
     end
@@ -173 +173 @@
         if (\FileOk(G.ObjectRefsFile)) then do
             rc = FileErrorCode(G.ObjectRefsFile)
-            say 'ERROR: Could not read "'G.ObjectRefsFile'" (rc='rc').'
+            say 'ERROR: wps-object: Could not read "'G.ObjectRefsFile'" (rc='rc').'
             return rc
         end
@@ -188 +188 @@
             if (\FileOk(pkgFile)) then do
                 rc = FileErrorCode(pkgFile)
-                say 'ERROR: Could not read "'pkgFile'" (rc='rc').'
+                say 'ERROR: wps-object: Could not read "'pkgFile'" (rc='rc').'
                 return rc
             end
@@ -195 +195 @@
                 s2 == '') then do
                 rc = -1
-                say 'ERROR: Line #'i 'in file "'pkgFile'" is invalid.'
+                say 'ERROR: wps-object: Line #'i 'in file "'pkgFile'" is invalid.'
                 return rc
             end
@@ -248 +248 @@
             if (rc \= 0 | \FileOk(refsFileTmp)) then do
                 rc = FileErrorCode(refsFileTmp)
-                say 'ERROR: Could not write to "'refsFileTmp'" (rc='rc').'
+                say 'ERROR: wps-object: Could not write to "'refsFileTmp'" (rc='rc').'
             end
             else do
@@ -265 +265 @@
             rc = SysFileDelete(pkgFile)
             if (rc \= 0) then do
-                say 'ERROR: Could not delete "'pkgFile'".'
+                say 'ERROR: wps-object: Could not delete "'pkgFile'".'
             end
         end
@@ -277 +277 @@
                     if (rc \= 0 | \FileOk(pkgFileTmp)) then do
                         rc = FileErrorCode(pkgFileTmp)
-                        say 'ERROR: Could not write to "'pkgFileTmp'" (rc='rc').'
+                        say 'ERROR: wps-object: Could not write to "'pkgFileTmp'" (rc='rc').'
                         leave
                     end
@@ -310 +310 @@
     parse var aSpec class'|'title'|'location'|'setup'|'option
     if (class == '' | title == '' | location == '') then do
-        say 'ERROR: Specification "'aSpec'" is invalid.'
+        say 'ERROR: wps-object: Specification "'aSpec'" is invalid.'
         return 1
     end
     if (pos('OBJECTID=', setup) > 0) then do
-        say 'ERROR: Specification string must not contain OBJECTID.'
+        say 'ERROR: wps-object: Specification string must not contain OBJECTID.'
         return 1
     end
@@ -325 +325 @@
     rc = SysCreateObject(class, title, location, setup, option)
     if (rc \== 1) then do
-        say 'ERROR: Could not create an object with ID <'aID'> and',
+        say 'ERROR: wps-object: Could not create an object with ID <'aID'> and',
             'specification "'aSpec'".'
         return 1
@@ -373 +373 @@
         end
         if (\ok) then do
-            say 'ERROR: Object reference file "'G.ObjectRefsFile'" is invalid',
-                'near object ID <'aID'>.'
+            say 'ERROR: wps-object: Object reference file "'G.ObjectRefsFile'" is invalid near object ID <'aID'>.'
             G.PackageObjects.!modified = 0
         end
@@ -433 +432 @@
     end
     if (\ok) then do
-        say 'ERROR: Object reference file "'G.ObjectRefsFile'" is invalid',
-            'near object ID <'aID'>.'
+        say 'ERROR: wps-object: Object reference file "'G.ObjectRefsFile'" is invalid near object ID <'aID'>.'
         G.PackageObjects.!modified = 0
     end
@@ -489 +487 @@
     rc = MakeDir(dir)
     if (rc \= 0) then do
-        say 'ERROR: Could not make directory "'dir'" (rc='rc').'
+        say 'ERROR: wps-object: Could not make directory "'dir'" (rc='rc').'
         return rc
     end
@@ -511 +509 @@
     dirTo = FixDir(filespec('D', aFileTo)||filespec('P', aFileTo))
     if (translate(dirFrom) \== translate(dirTo)) then do
-        say 'ERROR: "'aFileFrom'" and "'aFileTo'" must reside in the same',
+        say 'ERROR: wps-object: "'aFileFrom'" and "'aFileTo'" must reside in the same',
             'directory.'
         return -1
@@ -519 +517 @@
         rc = SysFileDelete(aFileTo)
         if (rc \= 0) then do
-            say 'ERROR: Could not delete "'aFileTo'" (rc='rc').'
+            say 'ERROR: wps-object: Could not delete "'aFileTo'" (rc='rc').'
             return rc
         end
@@ -526 +524 @@
     address 'cmd' 'rename 'aFileFrom filespec('N', aFileTo)
     if (rc \= 0) then do
-        say 'ERROR: Could not rename "'aFileFrom'" to "'aFileTo'" (rc='rc').'
+        say 'ERROR: wps-object: Could not rename "'aFileFrom'" to "'aFileTo'" (rc='rc').'
         return rc
     end