Browse Source

- Notice about missing class file when using pack -p optional

PHAR_1_2
Marcus Boerger 19 years ago
parent
commit
0dd84bb275
  1. 7
      ext/phar/phar/clicommand.inc
  2. 13
      ext/phar/phar/pharcommand.inc

7
ext/phar/phar/clicommand.inc

@ -86,9 +86,14 @@ abstract class CLICommand
call_user_func(array($this, $this->cmds[$command]['run']), $this->args);
}
static function error ($msg, $exit_code = 1)
static function notice ($msg)
{
fprintf(STDERR, $msg);
}
static function error ($msg, $exit_code = 1)
{
notice($msg);
exit($exit_code);
}

13
ext/phar/phar/pharcommand.inc

@ -180,8 +180,8 @@ class PharCommand extends CLICommand
/**
* Argument type loader
*
* @param string $arg Either 'auto' or an filename that contains class
* PHP_Archive
* @param string $arg Either 'auto', 'optional' or an filename that
* contains class PHP_Archive
* @param string $cfg Configuration to pass to a new file
* @param string $key The key
* @return string $arg The argument.
@ -197,8 +197,13 @@ class PharCommand extends CLICommand
break;
}
}
if (!isset($found) && $arg != 'optional') {
self::error("Pear package PHP_Archive or Archive.php class file not found.\n");
if (!isset($found)) {
$msg = "Pear package PHP_Archive or Archive.php class file not found.\n";
if ($arg == 'optional') {
self::notice($msg);
} else {
self::error($msg);
}
}
$arg = $found;
}

Loading…
Cancel
Save