interdiff:
diff --git a/src/Ganeti/WConfd/ConfigModifications.hs
b/src/Ganeti/WConfd/ConfigModifications.hs
index d4bc9f1..56b6aea 100644
--- a/src/Ganeti/WConfd/ConfigModifications.hs
+++ b/src/Ganeti/WConfd/ConfigModifications.hs
@@ -117,7 +117,7 @@ getAllIDs cs =
instKeys = keysFromC . configInstances . csConfigData $ cs
nodeKeys = keysFromC . configNodes . csConfigData $ cs
-
+
instValues = map uuidOf . valuesFromC
. configInstances . csConfigData $ cs
nodeValues = map uuidOf . valuesFromC . configNodes . csConfigData $
cs
@@ -303,7 +303,7 @@ attachInstanceDiskChecks uuidInst uuidDisk idx' cs = do
let insts = M.elems . fromContainer . configInstances . csConfigData $ cs
forM_ insts (\inst' -> when (uuidDisk `elem` instDisks inst') . Bad
. ReservationError $ printf "Disk %s already attached to instance %s"
- uuidDisk (show $ fromMaybe "" $ instName inst))
+ uuidDisk (show . fromMaybe "" $ instName inst))
-- * Pure config modifications functions
On Mon, Nov 23, 2015 at 3:58 PM Klaus Aehlig <[email protected]> wrote:
> On Mon, Nov 23, 2015 at 03:44:39PM +0100, 'Lisa Velden' via ganeti-devel
> wrote:
> > Signed-off-by: Lisa Velden <[email protected]>
> > ---
> > src/Ganeti/WConfd/ConfigModifications.hs | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/Ganeti/WConfd/ConfigModifications.hs
> b/src/Ganeti/WConfd/ConfigModifications.hs
> > index 9e66609..5b8c703 100644
> > --- a/src/Ganeti/WConfd/ConfigModifications.hs
> > +++ b/src/Ganeti/WConfd/ConfigModifications.hs
> > @@ -117,7 +117,7 @@ getAllIDs cs =
> >
> > instKeys = keysFromC . configInstances . csConfigData $ cs
> > nodeKeys = keysFromC . configNodes . csConfigData $ cs
> > -
> > +
>
> unreleated white-space change?
>
> > instValues = map uuidOf . valuesFromC
> > . configInstances . csConfigData $ cs
> > nodeValues = map uuidOf . valuesFromC . configNodes .
> csConfigData $ cs
> > @@ -303,7 +303,7 @@ attachInstanceDiskChecks uuidInst uuidDisk idx' cs =
> do
> > let insts = M.elems . fromContainer . configInstances . csConfigData
> $ cs
> > forM_ insts (\inst' -> when (uuidDisk `elem` instDisks inst') . Bad
> > . ReservationError $ printf "Disk %s already attached to instance
> %s"
> > - uuidDisk (show $ instName inst))
> > + uuidDisk (show $ fromMaybe "" (instName inst)))
>
> as per ours style it should be
>
> (show . fromMaybe "" $ instName inst)
>
>
> Rest looks good.
>
> --
> Klaus Aehlig
> Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
> Registergericht und -nummer: Hamburg, HRB 86891
> Sitz der Gesellschaft: Hamburg
> Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
>
--
Lisa Velden
Software Engineer
[email protected]
Google Germany GmbH
Dienerstraße 12
80331 München
Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
