[Piuparts-devel] [Git][debian/piuparts][helmutg/fix-usr-moved-sync] 3 commits: .gitlab-ci: Add reference to new salsaci wrap-and-sort job

[Nicolas Dandrimont (@olasd)]

Nicolas Dandrimont pushed to branch helmutg/fix-usr-moved-sync at Debian / piuparts


Commits:
1f42c568 by Nicolas Dandrimont at 2024-03-15T09:37:40+01:00
.gitlab-ci: Add reference to new salsaci wrap-and-sort job

- - - - -
25fb4851 by Nicolas Dandrimont at 2024-03-15T09:39:26+01:00
*.py: apply newer black formatting

- - - - -
73ec6764 by Helmut Grohne at 2024-03-15T09:40:20+01:00
/bin/sync moved to /usr, duplicate diversion

- - - - -


9 changed files:

- .gitlab-ci/salsaci-overrides.yml
- custom-scripts/scripts/post_setup_force-unsafe-io
- master-bin/detect_well_known_errors.py
- piuparts.py
- piupartslib/dependencyparser.py
- piupartslib/dwke.py
- tests/test_dependencyparser.py
- tests/test_piuparts.py
- tests/unittests.py


Changes:

=====================================
.gitlab-ci/salsaci-overrides.yml
=====================================
@@ -46,6 +46,8 @@ test-build-twice:
   stage: salsaci/test
 test-build-profiles:
   stage: salsaci/test
+wrap-and-sort:
+  stage: salsaci/test
 
 variables:
   SALSA_CI_REPROTEST_ENABLE_DIFFOSCOPE: 1


=====================================
custom-scripts/scripts/post_setup_force-unsafe-io
=====================================
@@ -19,6 +19,7 @@ fi
 
 if [ ! -h /bin/sync ]
 then
-	dpkg-divert --rename /bin/sync
+	dpkg-divert --rename /usr/bin/sync
+	dpkg-divert --rename --divert /bin/sync.usr-is-merged /bin/sync
 	ln -sv true /bin/sync
 fi


=====================================
master-bin/detect_well_known_errors.py
=====================================
@@ -43,7 +43,6 @@ class Busy(Exception):
 
 
 class WKE_Config(piupartslib.conf.Config):
-
     """Configuration parameters for Well Known Errors"""
 
     def __init__(self, section="global", defaults_section=None):


=====================================
piuparts.py
=====================================
@@ -66,7 +66,6 @@ DISTRO_CONFIG_FILE = "/etc/piuparts/distros.conf"
 
 
 class Defaults:
-
     """Default settings which depend on flavor of Debian.
 
     Some settings, such as the default mirror and distribution, depend on
@@ -119,7 +118,6 @@ class UbuntuDefaults(Defaults):
 
 
 class DefaultsFactory:
-
     """Instantiate the right defaults class."""
 
     def guess_flavor(self):
@@ -139,7 +137,6 @@ class DefaultsFactory:
 
 
 class Settings:
-
     """Global settings for this program."""
 
     def __init__(self):
@@ -766,7 +763,6 @@ FileInfo = namedtuple("FileInfo", ["st", "target", "user", "group"])
 
 
 class Chroot:
-
     """A chroot for testing things in."""
 
     def __init__(self):


=====================================
piupartslib/dependencyparser.py
=====================================
@@ -32,7 +32,6 @@ import re
 
 
 class DependencySyntaxError(Exception):
-
     """Syntax error in package dependency declaration"""
 
     def __init__(self, msg, cursor):
@@ -51,7 +50,6 @@ class DependencySyntaxError(Exception):
 
 
 class _Cursor:
-
     """Store an input string and a movable location in it"""
 
     def __init__(self, myinput):
@@ -120,7 +118,6 @@ class _Cursor:
 
 
 class SimpleDependency:
-
     """Express simple dependency towards another package"""
 
     def __init__(self, name, operator, version, arch):
@@ -139,7 +136,6 @@ class SimpleDependency:
 
 
 class DependencyParser:
-
     """Parse Debian package relationship strings
 
     Debian packages have a rich language for expressing their


=====================================
piupartslib/dwke.py
=====================================
@@ -31,7 +31,6 @@ LOG_EXT = ".log"
 
 
 class Problem:
-
     """Encapsulate a particular known problem"""
 
     required_tags = ["PATTERN", "WHERE", "ISSUE", "HEADER", "HELPTEXT"]
@@ -113,7 +112,6 @@ class Problem:
 
 
 class FailureManager:
-
     """Class to track known failures encountered, by package,
     where (e.g. 'fail'), and known problem type"""
 


=====================================
tests/test_dependencyparser.py
=====================================
@@ -4,7 +4,6 @@ import piupartslib.dependencyparser
 
 
 class DependencyParserTests(unittest.TestCase):
-
     """Tests for module dependencyparser."""
 
     def parse(self, str):


=====================================
tests/test_piuparts.py
=====================================
@@ -52,9 +52,10 @@ class DefaultsFactoryTests(unittest.TestCase):
         )
 
     def test_new_defaults_panics_with_unknown_flavor(self):
-        with patch.object(self.df, "guess_flavor", return_value="centos") as guess_flavor_mock, patch.object(
-            piuparts, "panic", side_effect=SystemExit
-        ) as panic_mock:
+        with (
+            patch.object(self.df, "guess_flavor", return_value="centos") as guess_flavor_mock,
+            patch.object(piuparts, "panic", side_effect=SystemExit) as panic_mock,
+        ):
             with self.assertRaises(SystemExit):
                 self.df.new_defaults()
 


=====================================
tests/unittests.py
=====================================
@@ -6,7 +6,6 @@ import piupartslib.packagesdb
 
 
 class FakeLogDB(piupartslib.packagesdb.LogDB):
-
     """A fake version of the LogDB class, for testing
 
     This version simulates filesystem actions so that there is no need



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/4eaf5bac9e46d2dac6d0b5f369d2e20a4abaddb6...73ec6764bead791f4df723fcdd0f4c3ffef818c8

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/4eaf5bac9e46d2dac6d0b5f369d2e20a4abaddb6...73ec6764bead791f4df723fcdd0f4c3ffef818c8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20240315/0cf61b1d/attachment-0001.htm>