]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
Merge branch 'installer-v2'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Apr 2010 14:43:03 +0000 (16:43 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Apr 2010 14:43:03 +0000 (16:43 +0200)
Conflicts:
lfs/python-parted
lfs/wireless-tools
pkgs/core/pomona/src/autopart.py
pkgs/core/pomona/src/backend.py
pkgs/core/pomona/src/bootloader.py
pkgs/core/pomona/src/cryptodev.py
pkgs/core/pomona/src/dmraid.py
pkgs/core/pomona/src/errors.py
pkgs/core/pomona/src/flags.py
pkgs/core/pomona/src/fsset.py
pkgs/core/pomona/src/installer.py
pkgs/core/pomona/src/instdata.py
pkgs/core/pomona/src/isys/devices.c
pkgs/core/pomona/src/isys/devices.h
pkgs/core/pomona/src/isys/eddsupport.c
pkgs/core/pomona/src/isys/eddsupport.h
pkgs/core/pomona/src/isys/ethtool.c
pkgs/core/pomona/src/isys/imount.c
pkgs/core/pomona/src/isys/imount.h
pkgs/core/pomona/src/isys/isofs.c
pkgs/core/pomona/src/isys/lang.c
pkgs/core/pomona/src/isys/lang.h
pkgs/core/pomona/src/isys/linkdetect.c
pkgs/core/pomona/src/isys/net.h
pkgs/core/pomona/src/isys/smp.c
pkgs/core/pomona/src/isys/smp.h
pkgs/core/pomona/src/isys/str.c
pkgs/core/pomona/src/isys/str.h
pkgs/core/pomona/src/isys/stubs.h
pkgs/core/pomona/src/isys/sundries.h
pkgs/core/pomona/src/isys/vio.c
pkgs/core/pomona/src/isys/wireless.c
pkgs/core/pomona/src/isys/wireless.h
pkgs/core/pomona/src/iutil.py
pkgs/core/pomona/src/keyboard_models.py
pkgs/core/pomona/src/lvm.py
pkgs/core/pomona/src/network.py
pkgs/core/pomona/src/packages.py
pkgs/core/pomona/src/pakfireinstall.py
pkgs/core/pomona/src/partErrors.py
pkgs/core/pomona/src/partIntfHelpers.py
pkgs/core/pomona/src/partRequests.py
pkgs/core/pomona/src/partedUtils.py
pkgs/core/pomona/src/partitioning.py
pkgs/core/pomona/src/partitions.py
pkgs/core/pomona/src/pomona_log.py
pkgs/core/pomona/src/raid.py
pkgs/core/pomona/src/scripts/getlangnames.py
pkgs/core/pomona/src/timezone.py
pkgs/core/pomona/src/tui.py
pkgs/core/pomona/src/tui_bootloader.py
pkgs/core/pomona/src/tui_complete.py
pkgs/core/pomona/src/tui_confirm.py
pkgs/core/pomona/src/tui_keyboard.py
pkgs/core/pomona/src/tui_language.py
pkgs/core/pomona/src/tui_network.py
pkgs/core/pomona/src/tui_partition.py
pkgs/core/pomona/src/tui_progress.py
pkgs/core/pomona/src/tui_timezone.py
pkgs/core/pomona/src/tui_userauth.py
pkgs/core/pomona/src/tui_welcome.py
pkgs/core/pomona/src/users.py
pkgs/core/pomona/src/zonetab.py
src/pomona/Makefile.inc
src/pomona/isys/Makefile
src/pomona/isys/imount.c
src/pomona/isys/mount.c
src/pomona/pomona
src/rootfiles/core/python-parted

43 files changed:
1  2 
.gitignore
pkgs/core/pomona/src/Makefile
pkgs/core/pomona/src/Makefile.inc
pkgs/core/pomona/src/console.py
pkgs/core/pomona/src/constants.py
pkgs/core/pomona/src/datastore.py
pkgs/core/pomona/src/dispatch.py
pkgs/core/pomona/src/exception.py
pkgs/core/pomona/src/isys/Makefile
pkgs/core/pomona/src/isys/isys.c
pkgs/core/pomona/src/isys/isys.h
pkgs/core/pomona/src/isys/isys.py
pkgs/core/pomona/src/isys/mount.c
pkgs/core/pomona/src/isys/mount.h
pkgs/core/pomona/src/keyboard.py
pkgs/core/pomona/src/language.py
pkgs/core/pomona/src/log.py
pkgs/core/pomona/src/partition.py
pkgs/core/pomona/src/po/Makefile
pkgs/core/pomona/src/pomona
pkgs/core/pomona/src/pomona.py
pkgs/core/pomona/src/pychecker-false-positives
pkgs/core/pomona/src/runpychecker.sh
pkgs/core/pomona/src/storage/__init__.py
pkgs/core/pomona/src/storage/deviceaction.py
pkgs/core/pomona/src/storage/devicelibs/__init__.py
pkgs/core/pomona/src/storage/devicelibs/crypto.py
pkgs/core/pomona/src/storage/devicelibs/lvm.py
pkgs/core/pomona/src/storage/devicelibs/swap.py
pkgs/core/pomona/src/storage/devices.py
pkgs/core/pomona/src/storage/devicetree.py
pkgs/core/pomona/src/storage/errors.py
pkgs/core/pomona/src/storage/formats/__init__.py
pkgs/core/pomona/src/storage/formats/fs.py
pkgs/core/pomona/src/storage/formats/luks.py
pkgs/core/pomona/src/storage/formats/lvmpv.py
pkgs/core/pomona/src/storage/formats/swap.py
pkgs/core/pomona/src/storage/partitioning.py
pkgs/core/pomona/src/storage/udev.py
pkgs/core/pomona/src/text.py
pkgs/core/pomona/src/util.py
pkgs/core/pomona/src/windows.py
tools/py-compile

diff --cc .gitignore
index ac3bb8ebb4b8b1a44728a4a0ffe265f10331a5ed,690c03f995fbd0c3a4e8b8b3974a8f23c9ae3e09..88d967589ee988833bd6d94f84510c127fef8bf8
@@@ -11,5 -15,5 +11,6 @@@
  /*.diff
  /*.iso
  /*.tar.gz
 +*.py[co]
  *~
+ *.py[co]
Simple merge
index 998fae836e2d0d22e1772a01ca3c321c4dc9b9e2,2d0731b79afd514f1a53b095f8dec24aa0067a8c..2878d110c628aff8cf1ba926a5427f7b6a01dfac
  #                                                                             #
  ###############################################################################
  
- ## Name of this program
- #
- PNAME = Pomona
- PSNAME = pomona
  DESTDIR=$(INSTALLER_DIR)
  
 -INSTALL = /usr/bin/install -c
 +INSTALL = install -c
  INSTALL_PROGRAM = ${INSTALL}
  INSTALL_DATA = ${INSTALL} -m 644
  INSTALLNLSDIR = $(DESTDIR)/usr/share/locale
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,eed9fa7db7b01deaf3ae587c0042abf50b343b3f..eed9fa7db7b01deaf3ae587c0042abf50b343b3f
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,b505322641809ec0da2d03a79e7a461cf742a7ab..b505322641809ec0da2d03a79e7a461cf742a7ab
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,30446269519a6b324a3758aedd2cb606b6930216..30446269519a6b324a3758aedd2cb606b6930216
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,bdbe5d4b149e116c7d683c3ed96963a482b9fcf5..bdbe5d4b149e116c7d683c3ed96963a482b9fcf5
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,aee3e5d5fc10a4290899e9ab305f991c500133c6..aee3e5d5fc10a4290899e9ab305f991c500133c6
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,3acd670ab1efbe46c6bedfbc89ae03a682ff382a..3acd670ab1efbe46c6bedfbc89ae03a682ff382a
mode 000000,100644..100644
--- /dev/null
Simple merge
index 1e991d0c3f284b3f6ea2cc8ecb0c3c7fd6ac1f77,5d25cf92e5306936888da2ec04decc753f98730f..75c9ce52c7962983efef222de77d678cf9f83bbe
  #                                                                             #
  ###############################################################################
  
 -echo "Running the Pomona Text Installer..."
 -echo -n "Loading modules:"
 -for i in md_mod dm_mod ext3 ext4 xfs reiserfs reiser4 btrfs; do
 -      echo -n " $i"
 -      modprobe $i
 -done
 -echo # Newline
 +echo "Running the Pomona Installer..."
  
- python /usr/lib/pomona/installer.py $@
+ python /usr/lib/pomona/pomona.py $@
 +ret=$?
  
  for i in $@; do
        if [ "$i" == "--debug" ]; then
index 0000000000000000000000000000000000000000,9348d2555ec0ccde04cb90dcea9a839966d927af..9348d2555ec0ccde04cb90dcea9a839966d927af
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,2719311164e3efde1f43db8b41936e52318d3923..2719311164e3efde1f43db8b41936e52318d3923
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,e9afb4d8b9a7ec949c78d99793239387f72da74d..e9afb4d8b9a7ec949c78d99793239387f72da74d
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,5fbc81955f8e09e9508f65f62f4eac852de74c5d..5fbc81955f8e09e9508f65f62f4eac852de74c5d
mode 000000,100644..100644
--- /dev/null
index 096c3d62392d70e94502b5b24e3be29de2a850db,0000000000000000000000000000000000000000..66c33edfe787e189965e07417d1eaff8d5e22892
mode 100755,000000..100755
--- /dev/null
@@@ -1,48 -1,0 +1,48 @@@
-     if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
 +#!/bin/sh
 +
 +PYTHON=$(which python 2>/dev/null)
 +
 +if [ -z "${PYTHON}" ]; then
 +      # Python is not present. Fail silently.
 +      exit 0
 +fi
 +
 +files=""
 +for i in $*; do
 +      if [ -e ${i}c ] && [ -e ${i}o ]; then
 +              continue # all files we want are already there
 +      fi
 +      files="$files $i"
 +done
 +
 +if [ -z "${files}" ]; then
 +      # No files need to be proceeded.
 +      exit 0
 +fi
 +
 +$PYTHON -c "
 +import sys, os, string, py_compile
 +
 +files = '''$files'''
 +print 'Byte-compiling python modules...'
 +for file in string.split(files):
-     py_compile.compile(path)
++    if not os.path.exists(file) or not (len(file) >= 3 and file[-3:] == '.py'):
 +        continue
 +    print file,
 +    sys.stdout.flush()
-     if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
++    py_compile.compile(file)
 +print" || exit $?
 +
 +# this will fail for python < 1.5, but that doesn't matter ...
 +$PYTHON -O -c "
 +import sys, os, string, py_compile
 +
 +files = '''$files'''
 +print 'Byte-compiling python modules (optimised versions) ...'
 +for file in string.split(files):
-     py_compile.compile(path)
++    if not os.path.exists(file) or not (len(file) >= 3 and file[-3:] == '.py'):
 +        continue
 +    print file,
 +    sys.stdout.flush()
++    py_compile.compile(file)
 +print" 2>/dev/null || :