I'd like to preface this by saying I think I agree with all these
problems, but I'd like to hold off on most until after the beta. The
legitimate problems should get committed right now.
> diff --git a/storage/__init__.py b/storage/__init__.py
> index fd9f289..58f12be 100644
> --- a/storage/__init__.py
> +++ b/storage/__init__.py
> @@ -75,7 +75,7 @@ def storageInitialize(anaconda):
>
> device = storage.devicetree.resolveDevice(devspec)
> if device is None:
> - if self.getUpgrade():
> + if anaconda.id.getUpgrade():
> return
> else:
> anaconda.intf.messageWindow(_("Unknown Device"),
> @@ -458,7 +458,7 @@ class Storage(object):
> part.fileSystemType in ("ext3", "ext2", "fat16", "fat32"):
> dests.append(part.path, device.name)
>
> - if not parts:
> + if not disk.partitions:
> dests.append(device.path, device.name)
>
> return dests
> @@ -650,7 +650,7 @@ class Storage(object):
> return False
> return True
> elif device.format.type == "swap":
> - return True
> + return True
>
> # be safe for anything else and default to off
> return False
> @@ -867,7 +867,7 @@ class Storage(object):
> def writeKS(self, f):
> log.warning("Storage.writeKS not completely implemented")
> self.iscsi.writeKS(f)
> - self.zfcp.writeFS(f)
> + self.zfcp.writeKS(f)
>
>
> def getReleaseString(mountpoint):
> @@ -1062,7 +1062,6 @@ class CryptTab(object):
> except Exception:
> self.blkidTab = None
>
> - for line in lines:
> (line, pound, comment) = line.partition("#")
> fields = line.split()
> if not 2 <= len(fields) <= 4:
> @@ -1147,6 +1146,7 @@ class FSSet(object):
> self.devicetree = devicetree
> self.cryptTab = None
> self.blkidTab = None
> + self.origFStab = None
> self.active = False
> self._dev = None
> self._devpts = None
These all look good.
> diff --git a/storage/deviceaction.py b/storage/deviceaction.py
> index ba4456a..b462108 100644
> --- a/storage/deviceaction.py
> +++ b/storage/deviceaction.py
Everything in this file can wait.
> --- a/storage/devicelibs/crypto.py
> +++ b/storage/devicelibs/crypto.py
> @@ -23,7 +23,6 @@
> import os
> from pycryptsetup import CryptSetup
>
> -import iutil
> from ..errors import *
>
> import gettext
Everything here can wait.
> diff --git a/storage/devicelibs/lvm.py b/storage/devicelibs/lvm.py
> index 52d9315..b43ef0a 100644
> --- a/storage/devicelibs/lvm.py
> +++ b/storage/devicelibs/lvm.py
> @@ -27,6 +27,7 @@ import re
> import iutil
>
> from ..errors import *
> +from constants import *
>
> import gettext
> _ = lambda x: gettext.ldgettext("anaconda", x)
This chunk looks like a legitimate problem. All others in this file can
wait.
> --- a/storage/devicelibs/mdraid.py
> +++ b/storage/devicelibs/mdraid.py
> @@ -28,6 +28,9 @@ from ..errors import *
> import gettext
> _ = lambda x: gettext.ldgettext("anaconda", x)
>
> +import logging
> +log = logging.getLogger("storage")
> +
> # raidlevels constants
> RAID10 = 10
> RAID6 = 6
We should take this chunk right away too.
> diff --git a/storage/devicelibs/swap.py b/storage/devicelibs/swap.py
> index 38000eb..dadeb0a 100644
> --- a/storage/devicelibs/swap.py
> +++ b/storage/devicelibs/swap.py
> @@ -23,7 +23,7 @@
> import resource
>
> import iutil
> -import resource
> +import os
>
> from ..errors import *
>
We should also take this chunk immediately.
> diff --git a/storage/formats/mdraid.py b/storage/formats/mdraid.py
> index 0871a2a..ec1a617 100644
> --- a/storage/formats/mdraid.py
> +++ b/storage/formats/mdraid.py
> @@ -69,7 +69,7 @@ class MDRaidMember(DeviceFormat):
> log_method_call(self, device=self.device,
> type=self.type, status=self.status)
> if not self.exists:
> - raise MDRaidMemberError("format does not exist")
> + raise MDMemberError("format does not exist")
>
> info = mdraid.mdexamine(self.device)
> if self.uuid is None:
This looks like a good one to have now.
> diff --git a/storage/formats/swap.py b/storage/formats/swap.py
> index e5dd8ef..bc5dbd9 100644
> --- a/storage/formats/swap.py
> +++ b/storage/formats/swap.py
> @@ -20,9 +20,7 @@
> # Red Hat Author(s): Dave Lehman <dlehman@xxxxxxxxxx>
> #
>
> -import os
> -
> -from iutil import log_method_call
> +from iutil import log_method_call, numeric_type
> from parted import PARTITION_SWAP
> from ..errors import *
> from ..devicelibs import swap
So does this one.
I think that's it. All the others can wait until after we get the beta
out, so we can minimize the chances for random exceptions to creep in.
- Chris
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
