Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* commentleri cikar, installable'daki if blogunu biraz duzelt, geyik ekle

Browse Source
This commit is contained in:
Eray Özkural
2005-06-24 16:55:36 +00:00
parent f77f64fd72
commit e7fb3c923b
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi-install
+1
View File
@@ -45,6 +45,7 @@ def main():
print '*** An installation error has occured:' print '*** An installation error has occured:'
print ' ', estr print ' ', estr
sys.exit(1) sys.exit(1)
ui.info("Package(s) installed successfully as intended.\n")
if __name__ == "__main__": if __name__ == "__main__":
main() main()
pisi/archive.py
-3
View File
@@ -123,15 +123,12 @@ class ArchiveZip(ArchiveBase):
else: else:
# change archiveRoot # change archiveRoot
if util.subpath(archiveRoot, info.filename): if util.subpath(archiveRoot, info.filename):
print '!', archiveRoot, info.filename
outpath = util.removepathprefix(archiveRoot, outpath = util.removepathprefix(archiveRoot,
info.filename) info.filename)
print '*', outpath
else: else:
continue # don't extract if not under continue # don't extract if not under
ofile = os.path.join(targetDir, outpath) ofile = os.path.join(targetDir, outpath)
print 'ofile ', ofile
if isdir: # a directory is present. if isdir: # a directory is present.
continue # FIXME: do nothing! continue # FIXME: do nothing!
pisi/dependency.py
+5 -5
View File
@@ -24,7 +24,7 @@ def installDeps(pkg):
def satisfiesInstallDeps(pkg): def satisfiesInstallDeps(pkg):
deps = installDeps(pkg) deps = installDeps(pkg)
print 'installdeps = ', deps # print 'installdeps = ', deps
return reduce(lambda x,y:x and y, return reduce(lambda x,y:x and y,
map(lambda x: satisfiesDep(pkg, x), deps),True) map(lambda x: satisfiesDep(pkg, x), deps),True)
@@ -33,7 +33,7 @@ def runtimeDeps(pkg):
def satisfiesRuntimeDeps(pkg): def satisfiesRuntimeDeps(pkg):
deps = runtimeDeps(pkg) deps = runtimeDeps(pkg)
print 'runtimedeps = ', deps # print 'runtimedeps = ', deps
return reduce(lambda x,y:x and y, return reduce(lambda x,y:x and y,
map(lambda x: satisfiesDep(pkg, x), deps),True) map(lambda x: satisfiesDep(pkg, x), deps),True)
@@ -43,9 +43,9 @@ def installable(pkg):
if not packagedb.has_package(pkg): if not packagedb.has_package(pkg):
ui.info("package " + pkg + " is not present in the package database\n"); ui.info("package " + pkg + " is not present in the package database\n");
return False return False
elif not satisfiesRuntimeDeps(pkg) and satisfiesInstallDeps(pkg): elif satisfiesRuntimeDeps(pkg) and satisfiesInstallDeps(pkg):
return True
else:
ui.info("package " + pkg + " does not satisfy dependencies\n"); ui.info("package " + pkg + " does not satisfy dependencies\n");
return False return False
else:
return True