Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 528c6ac8eac7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6c9a0e0324e5
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 24, 2017

  1. blivet: Remove all imports of pyanaconda 

    We already had stubs for some pyanaconda imports so far, but some
functionality like enable_installer_mode() inherently depends on it, so
let's remove enable_installer_mode().

Another occurence of pyanaconda import is in storage_initialize():

  from pyanaconda.flags import flags as anaconda_flags
  flags.update_from_anaconda_flags(anaconda_flags)

This is an installer-specific function which should also be quite tied
to pyanaconda, but instead of removing this function altogether, we just
remove the import, because it only appends certain flags from the
pyanaconda module.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    69149f3 View commit details
    Browse the repository at this point in the history

  2. blivet: Update patch for setting UUIDs 

    This just contains one additional commit which fixes various pylint
errors.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    c444416 View commit details
    Browse the repository at this point in the history

  3. blivet: Run pocketlint tests in checkPhase 

    So far we had disabled the tests while referring to the NixOS VM test
instead. However, it's desirable to run as much tests as we can, so
let's run the pocketlint tests in checkPhase instead of skipping it
altogether.

In my case this is very useful because it would have caught a few errors
during development of the UUIDs pull request:

storaged-project/blivet#537

But even if we're not directly developing for the upstream project, this
also catches Nix-related errors, such as references against pyanaconda
which might still exist or exist again after an update.

I'm using a list to accumulate find arguments because I wanted to avoid
endless repetitions of -o -path xyz -prune.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    7b4c696 View commit details
    Browse the repository at this point in the history

  4. blivet: Verify PEP8 compliance in checkPhase 

    This is also part of blivet's "make check", so I've included it for
completeness and almost verbatim because blivet does not comply to a few
points in PEP8, like when it comes to line length.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    6c9a0e0 View commit details
    Browse the repository at this point in the history