* update zip and unzip to spec

* update beta-light script
* remove redundant upgrade-all command, try "pisi up" :)
* typo / help improvements

pisi/api.py

@@ -281,12 +281,16 @@ def package_graph(A, ignore_installed = False):
 def upgrade(A):
     upgrade_pkg_names(A)
 
-def upgrade_pkg_names(A):
+def upgrade_pkg_names(A = []):
     """Re-installs packages from the repository, trying to perform
     a maximum number of upgrades."""
     
     ignore_build = ctx.config.options and ctx.config.options.ignore_build_no
 
+    if not A:
+        # if A is empty, then upgrade all packages
+        A = ctx.installdb.list_installed()
+
     # filter packages that are not upgradable
     A_0 = A = set(A)
     Ap = []

pisi/cli/commands.py

@@ -377,7 +377,11 @@ specified a package name, it should exist in a specified repository.
 class Upgrade(PackageOp):
     """Upgrade PISI packages
 
-Usage: Upgrade <package1> <package2> ... <packagen>
+Usage: Upgrade [<package1> <package2> ... <packagen>]
+
+<packagei>: package name
+
+Upgrades the entire system if no package names are given
 
 You may use only package names to specify packages because
 the package upgrade operation is defined only with respect 
@@ -430,34 +434,6 @@ Remove package(s) from your system. Just give the package names to remove.
         self.finalize()
 
 
-class UpgradeAll(PackageOp):
-    """Upgrade system
-
-Usage: Upgrade
-
-Upgrade the entire system.
-"""
-    __metaclass__ = autocommand
-
-    def __init__(self):
-        super(UpgradeAll, self).__init__()
-
-    name = ("upgrade-all", None)
-
-    def options(self):
-        super(UpgradeAll, self).options()
-        buildno_opts(self)
-
-    def run(self):
-        if self.args:
-            self.help()
-            return
-
-        self.init()
-        pisi.api.upgrade(ctx.installdb.list_installed())
-        self.finalize()
-
-
 class ConfigurePending(PackageOp):
     """configure pending packages
     """
@@ -604,11 +580,11 @@ Usage: list-installed
 class UpdateRepo(Command):
     """Update repository databases
 
-Usage: update-repo <repo1> <repo2> ... <repon>
+Usage: update-repo [<repo1> <repo2> ... <repon>]
 
 <repoi>: repository name
 Synchronizes the PiSi databases with the current repository.
-If no repositories are given, all repositories are updated.
+If no repository is given, all repositories are updated.
 """
     __metaclass__ = autocommand
 

pisi/operations.py

@@ -117,6 +117,10 @@ def install_single_name(name, upgrade = False):
     else:
         ctx.ui.error(_("Package %s not found in any active repository.") % pkg)
 
+# high level operations
+
+
+
 # deneme, don't remove ulan
 class AtomicOperation(object):
     def __init__(self, package, ignore_dep = False):

pisi/specfile.py

@@ -163,7 +163,7 @@ class UpdateInfo:
     def has_errors(self):
         err = Checks()
         if not self.release:
-            err.add(_("Update must have a Release attribute"))
+            err.add(_("Update must have a release attribute"))
         err.has_tag(self.date, "Update", "Date")
         #err.has_tag(self.version, "Update", "Version")
         return err.list

tests/beta-light.sh

@@ -3,18 +3,18 @@
 pwd
 PATH=$PATH:.
 set -x
-pisi-cli --ignore-comar remove unzip
+pisi-cli -B -Dtmp remove unzip
 set -e
-pisi-cli --ignore-build-no build tests/zip/pspec.xml tests/unzip/pspec.xml
-pisi-cli index .
-pisi-cli add-repo repo1 pisi-index.xml
-pisi-cli list-repo
-pisi-cli update-repo repo1
-pisi-cli list-available
-pisi-cli --ignore-comar install zip
-pisi-cli list-installed
-pisi-cli --ignore-comar remove unzip
-pisi-cli info zip*.pisi
-pisi-cli --ignore-comar install zip*.pisi
-pisi-cli list-pending
-pisi-cli configure-pending
+pisi-cli -Dtmp -E --ignore-build-no build tests/zip/pspec.xml tests/unzip/pspec.xml
+pisi-cli -Dtmp index .
+pisi-cli -Dtmp add-repo repo1 pisi-index.xml
+pisi-cli -Dtmp list-repo
+pisi-cli -Dtmp update-repo repo1
+pisi-cli -Dtmp list-available
+pisi-cli -Dtmp --ignore-comarinstall zip
+pisi-cli -Dtmp list-installed
+pisi-cli -Dtmp --ignore-comar remove unzip
+pisi-cli -Dtmp info zip*.pisi
+pisi-cli -Dtmp --ignore-comar install zip*.pisi
+pisi-cli -Dtmp list-pending
+pisi-cli -Dtmp configure-pending

tests/unzip/pspec.xml

@@ -24,13 +24,6 @@
             <Dependency>sed</Dependency>
             <Dependency>patch</Dependency>
         </BuildDependencies>
-        <History>
-            <Update>
-                <Date>2005-07-15</Date>
-                <Version>5.50</Version>
-                <Release>1</Release>
-            </Update>
-        </History>
     </Source>
 
     <Package>
@@ -44,6 +37,12 @@
     	    <Path fileType="doc">/usr/share/man</Path>
         </Files>
   </Package>
+  <History>
+     <Update release="1">
+        <Date>2005-07-15</Date>
+        <Version>5.50</Version>
+     </Update>
+   </History>
 
 </PISI>
 

tests/zip/pspec.xml

@@ -7,8 +7,8 @@
         <Name>zip</Name>
         <Homepage>ftp://ftp.freesoftware.com/pub/infozip/Zip.html</Homepage>
         <Packager>
-            <Name>PACKAGER</Name>
-            <Email>PACKAGER_EMAIL</Email>
+            <Name>zibidi</Name>
+            <Email>himini@gmail.com</Email>
         </Packager>
         <License>Info-ZIP</License>
         <IsA>category</IsA>
@@ -22,16 +22,8 @@
             <Patch level="1">zcrypt.patch</Patch>
         </Patches>
         <BuildDependencies>
-            <Dependency>unzip</Dependency>
             <Dependency>patch</Dependency>
         </BuildDependencies>
-        <History>
-            <Update>
-                <Date>2005-07-15</Date>
-                <Version>2.3</Version>
-                <Release>1</Release>
-            </Update>
-        </History>
     </Source>
 
     <Package>
@@ -45,6 +37,12 @@
             <Path fileType="doc">/usr/share/man</Path>
         </Files>
   </Package>
+  <History>
+     <Update release="1">
+       <Date>2005-07-15</Date>
+       <Version>2.3</Version>
+     </Update>
+  </History>
 
 </PISI>