diff --git a/pisi.e3p b/pisi.e3p
index 0800f91f..4dd54ce4 100644
--- a/pisi.e3p
+++ b/pisi.e3p
@@ -1,7 +1,7 @@
-
+
Python
@@ -305,6 +305,32 @@
TODO
+
+ tools
+ fetchAll.py
+
+
+ pisi
+ actionsapi
+ pythonmodules.py
+
+
+ pisi
+ actionsapi
+ scons.py
+
+
+ pisi
+ cli
+ colors.py
+
+
+ pisi
+ data.py
+
+
+ pisi-cli
+
@@ -342,10 +368,10 @@
{'standardLayout': 1}
-
-
-
-
+
+
+
+
diff --git a/pisi/api.py b/pisi/api.py
index bf1992ef..f3658357 100644
--- a/pisi/api.py
+++ b/pisi/api.py
@@ -84,7 +84,7 @@ def install(packages):
try:
# determine if this is a list of files/urls or names
- if packages[0].endswith(ctx.const.package_prefix): # they all have to!
+ if packages[0].endswith('.pisi'): # they all have to!
return install_pkg_files(packages)
else:
return install_pkg_names(packages)
@@ -289,6 +289,8 @@ def upgrade_pkg_names(A):
# filter packages that are not upgradable
Ap = []
for x in A:
+ if x.endswith('.pisi'):
+ ctx.ui.debug("Warning: package *name* ends with '.pisi'")
if not ctx.installdb.is_installed(x):
ctx.ui.info('Package %s is not installed.' % x)
continue
diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py
index 94fa23b6..f2806da7 100644
--- a/pisi/cli/commands.py
+++ b/pisi/cli/commands.py
@@ -137,6 +137,7 @@ class Command(object):
"""print help for the command"""
ctx.ui.info(self.format_name() + ': ')
print getattr(self, "__doc__")
+ print
print self.parser.format_option_help()
def die(self):
@@ -340,9 +341,12 @@ class Upgrade(PackageOp):
Usage: Upgrade ...
-You may use filenames, URIs or package names for packages. If you have
-specified a package name, it should exist in a specified repository.
-"""
+You may use only package names to specify packages because
+the package upgrade operation is defined only with respect
+to repositories. If you have specified a package name, it
+should exist in the package repositories. If you just want to
+reinstall a package from a pisi file, use the install command."""
+
__metaclass__ = autocommand
def __init__(self):