Revision 43790 trunk/org.gvsig.desktop/org.gvsig.desktop.installer/src/main/packaging/gvspkg
gvspkg | ||
---|---|---|
629 | 629 |
shorthelp(args) |
630 | 630 |
sys.exit(2) |
631 | 631 |
|
632 |
for platform in platforms: |
|
633 |
excludes_pkg_by_os[platform.getOS()] = list() |
|
634 |
|
|
632 | 635 |
default_selection = None |
633 | 636 |
index_only = False |
634 | 637 |
clear_list=False |
... | ... | |
646 | 649 |
elif opt in ( "--excludepki"): |
647 | 650 |
excludes_pki.append(arg) |
648 | 651 |
elif opt in ( "--excludepkg"): |
649 |
excludes_pkg.append(arg) |
|
652 |
if ":" in arg: |
|
653 |
osid, arg = arg.split(":") |
|
654 |
excludes_pkg_by_os[osid] = arg |
|
655 |
else: |
|
656 |
excludes_pkg.append(arg) |
|
650 | 657 |
elif opt in ( "--include", "-I"): |
651 | 658 |
if not os.path.isabs(arg) : |
652 | 659 |
arg = os.path.join(getPool(), arg) |
... | ... | |
715 | 722 |
message( "Writing 'packages-"+platform.getOS()+"-"+platform.getArch()+".gvspks' to '%s'" % packages_gvspks ) |
716 | 723 |
set = zipfile.ZipFile(packages_gvspks,"w",zipfile.ZIP_STORED) |
717 | 724 |
for info in indexes: |
718 |
if not info.match(excludes_pkg): |
|
725 |
if not info.match(excludes_pkg) and not info.match(excludes_pkg_by_os[platform.getOS()]):
|
|
719 | 726 |
try: |
720 | 727 |
if info.hasPkg(): |
721 | 728 |
if info.getOS() in ("all", platform.getOS()) : |
... | ... | |
2017 | 2024 |
main() |
2018 | 2025 |
|
2019 | 2026 |
|
2027 |
|
Also available in: Unified diff