diff --git a/src/pisi-build b/src/pisi-build index de3fbd96..a9942559 100755 --- a/src/pisi-build +++ b/src/pisi-build @@ -4,22 +4,22 @@ # python standard library from os.path import basename -import pisiconfig -import util -from pisibuild import PisiBuild, PisiBuildError +import pisi.config +import pisi.util +from pisi.build import PisiBuild, PisiBuildError def doProgress(filename, percent, rate, symbol): out = '\r%-30.30s %3d%% %12.2f %s' % \ (pd['filename'], pd['percent'], pd['rate'], pd['symbol']) - util.information(out) + pisi.util.information(out) def main(): import sys import getopt # wrapper for usage(progname) function - help = lambda: util.usage(sys.argv[0]) + help = lambda: pisi.util.usage(sys.argv[0]) # getopt magic try: @@ -47,11 +47,11 @@ def main(): # doing the real job. pb = PisiBuild(pspec) - util.information("Building PISI source package: %s\n" % pb.spec.sourceName) + pisi.util.information("Building PISI source package: %s\n" % pb.spec.sourceName) - util.information("Fetching source from: %s (be patient)\n" % pb.spec.archiveUri) + pisi.util.information("Fetching source from: %s (be patient)\n" % pb.spec.archiveUri) pb.fetchArchive(doProgress) - util.information("Source archive is stored: %s/%s\n" %(pisiconfig.archives_dir, pb.archiveName)) + pisi.util.information("Source archive is stored: %s/%s\n" %(pisi.config.archives_dir, pb.archiveName)) # pb.unpackArchive() # pb.applyPatches() # pb.buildSource() diff --git a/src/pisi-install b/src/pisi-install index ea46a53d..a18d8d75 100755 --- a/src/pisi-install +++ b/src/pisi-install @@ -1,15 +1,15 @@ #! /usr/bin/python # -*- coding: utf-8 -*- -import install -import util +import pisi.install +import pisi.util def main(): import sys import getopt # wrapper for usage(progname) function - help = lambda: util.usage(sys.argv[0]) + help = lambda: pisi.util.usage(sys.argv[0]) # getopt magic try: @@ -31,11 +31,11 @@ def main(): # sequentially. if len(args) != 1: help() - raise util.ArgError, "pisi-install expects one (and only one) package file currently" + raise pisi.util.ArgError, "pisi-install expects one (and only one) package file currently" else: package_fn = args[0] - install.install_package_file(package_fn) + pisi.install.install_package_file(package_fn) if __name__ == "__main__": diff --git a/src/pisi/__init__.py b/src/pisi/__init__.py new file mode 100644 index 00000000..2816f232 --- /dev/null +++ b/src/pisi/__init__.py @@ -0,0 +1,4 @@ + +# PISI package version +__version__ = "0.1" + diff --git a/src/pisi/__init__.pyc b/src/pisi/__init__.pyc new file mode 100644 index 00000000..d5ba2492 Binary files /dev/null and b/src/pisi/__init__.pyc differ diff --git a/src/pisibuild.py b/src/pisi/build.py similarity index 94% rename from src/pisibuild.py rename to src/pisi/build.py index b84d686d..b0a122c4 100644 --- a/src/pisibuild.py +++ b/src/pisi/build.py @@ -9,7 +9,7 @@ from fetcher import Fetcher # from archive import Archive # import pisipackage import util -import pisiconfig +import config class PisiBuildError(Exception): @@ -28,7 +28,7 @@ class PisiBuild: self.spec = spec def fetchArchive(self, percentHook=None): - """fetch an archive and store to pisiconfig.archives_dir + """fetch an archive and store to pisi.config.archives_dir using fether.Fetcher""" fetch = Fetcher(self.spec.archiveUri) diff --git a/src/pisi/build.pyc b/src/pisi/build.pyc new file mode 100644 index 00000000..f2c521e8 Binary files /dev/null and b/src/pisi/build.pyc differ diff --git a/src/pisiconfig.py b/src/pisi/config.py similarity index 100% rename from src/pisiconfig.py rename to src/pisi/config.py diff --git a/src/pisi/config.pyc b/src/pisi/config.pyc new file mode 100644 index 00000000..0ac3bae2 Binary files /dev/null and b/src/pisi/config.pyc differ diff --git a/src/dependency.py b/src/pisi/dependency.py similarity index 100% rename from src/dependency.py rename to src/pisi/dependency.py diff --git a/src/fetcher.py b/src/pisi/fetcher.py old mode 100755 new mode 100644 similarity index 98% rename from src/fetcher.py rename to src/pisi/fetcher.py index 12d79ea2..cae68542 --- a/src/fetcher.py +++ b/src/pisi/fetcher.py @@ -10,7 +10,7 @@ from sys import exit from sys import stderr # pisi modules -import pisiconfig +import config import util class FetchError (Exception): @@ -20,7 +20,7 @@ class Fetcher: """Yet another Pisi tool for fetching files from various sources..""" def __init__(self, uri): self.uri = uri - self.filedest = pisiconfig.archives_dir + self.filedest = config.archives_dir util.check_dir(self.filedest) self.scheme = "file" self.netloc = "" diff --git a/src/pisi/fetcher.pyc b/src/pisi/fetcher.pyc new file mode 100644 index 00000000..fa517647 Binary files /dev/null and b/src/pisi/fetcher.pyc differ diff --git a/src/install.py b/src/pisi/install.py similarity index 100% rename from src/install.py rename to src/pisi/install.py diff --git a/src/pisi/install.pyc b/src/pisi/install.pyc new file mode 100644 index 00000000..8364c556 Binary files /dev/null and b/src/pisi/install.pyc differ diff --git a/src/installdb.py b/src/pisi/installdb.py similarity index 100% rename from src/installdb.py rename to src/pisi/installdb.py diff --git a/src/package.py b/src/pisi/package.py similarity index 100% rename from src/package.py rename to src/pisi/package.py diff --git a/src/pisi/package.pyc b/src/pisi/package.pyc new file mode 100644 index 00000000..b02d9e7c Binary files /dev/null and b/src/pisi/package.pyc differ diff --git a/src/packagedb.py b/src/pisi/packagedb.py similarity index 100% rename from src/packagedb.py rename to src/pisi/packagedb.py diff --git a/src/specfile.py b/src/pisi/specfile.py similarity index 100% rename from src/specfile.py rename to src/pisi/specfile.py diff --git a/src/pisi/specfile.pyc b/src/pisi/specfile.pyc new file mode 100644 index 00000000..514c024f Binary files /dev/null and b/src/pisi/specfile.pyc differ diff --git a/src/util.py b/src/pisi/util.py similarity index 100% rename from src/util.py rename to src/pisi/util.py diff --git a/src/pisi/util.pyc b/src/pisi/util.pyc new file mode 100644 index 00000000..8cf415db Binary files /dev/null and b/src/pisi/util.pyc differ diff --git a/src/xmlfile.py b/src/pisi/xmlfile.py similarity index 100% rename from src/xmlfile.py rename to src/pisi/xmlfile.py diff --git a/src/pisi/xmlfile.pyc b/src/pisi/xmlfile.pyc new file mode 100644 index 00000000..b46e7a03 Binary files /dev/null and b/src/pisi/xmlfile.pyc differ