Changeset 40494 for trunk

Timestamp:

Jun 27, 2018, 4:15:11 PM (8 years ago)

Author:

eugene

Message:

merge changes from czw dev branch to support Ubuntu 16.04

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/relastro/src (modified) (1 prop)
• PS-IPP-Config (modified) (1 prop)
• PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (1 diff)
• extlibs (modified) (1 prop)
• extlibs/readline-5.2-p15.tar.gz (copied) (copied from branches/czw_branch/20170908/extlibs/readline-5.2-p15.tar.gz )
• ippMonitor (modified) (1 prop)
• ippMonitor/raw/ipp.php (modified) (1 diff)
• ippconfig (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/tagsets/ipp-3.1.dist (copied) (copied from branches/czw_branch/20170908/psconfig/tagsets/ipp-3.1.dist )
• psconfig/tagsets/ipp-3.1.libs (copied) (copied from branches/czw_branch/20170908/psconfig/tagsets/ipp-3.1.libs )
• psconfig/tagsets/ipp-3.1.perl (copied) (copied from branches/czw_branch/20170908/psconfig/tagsets/ipp-3.1.perl )
• tools (modified) (1 prop)
• tools/hsc (copied) (copied from branches/czw_branch/20170908/tools/hsc )

trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -427 +427 @@
 
     # if not, call _neb_start() and return the new object
-    return $self->_neb_start() or ( carp "Can't start Nebulous" and return undef );
+    (return $self->_neb_start()) or ( carp "Can't start Nebulous" and return undef );
 }
 

trunk/ippMonitor/raw/ipp.php

@@ -351 +351 @@
   // loop over the lines in the file and generate lines in the menu
   while ($line = fgetcsv ($file, 1024, "|")) {
-    if (ereg ('^[:blank:]*#', $line[0])) continue;
+    if (preg_match ('^[:blank:]*#', $line[0])) continue;
     if (count($line) < 2) continue;