mirror of
https://github.com/arcan1s/ahriman.git
synced 2025-06-30 23:55:49 +00:00
Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
5d4bd9e459 | |||
4f21eb6fe6 |
@ -1,7 +1,7 @@
|
|||||||
# Maintainer: Evgeniy Alekseev
|
# Maintainer: Evgeniy Alekseev
|
||||||
|
|
||||||
pkgname='ahriman'
|
pkgname='ahriman'
|
||||||
pkgver=2.3.0rc1
|
pkgver=2.3.0rc2
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="ArcH linux ReposItory MANager"
|
pkgdesc="ArcH linux ReposItory MANager"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
|
@ -86,7 +86,7 @@ class Sources(LazyLogging):
|
|||||||
elif remote is not None:
|
elif remote is not None:
|
||||||
instance.logger.info("clone remote %s to %s using branch %s", remote.git_url, sources_dir, branch)
|
instance.logger.info("clone remote %s to %s using branch %s", remote.git_url, sources_dir, branch)
|
||||||
Sources._check_output("git", "clone", "--branch", branch, "--single-branch",
|
Sources._check_output("git", "clone", "--branch", branch, "--single-branch",
|
||||||
remote.git_url, str(sources_dir), cwd=sources_dir, logger=instance.logger)
|
remote.git_url, str(sources_dir), logger=instance.logger)
|
||||||
else:
|
else:
|
||||||
# it will cause an exception later
|
# it will cause an exception later
|
||||||
instance.logger.error("%s is not initialized, but no remote provided", sources_dir)
|
instance.logger.error("%s is not initialized, but no remote provided", sources_dir)
|
||||||
|
@ -17,4 +17,4 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
__version__ = "2.3.0rc1"
|
__version__ = "2.3.0rc2"
|
||||||
|
@ -75,7 +75,7 @@ def test_fetch_new(remote_source: RemoteSource, mocker: MockerFixture) -> None:
|
|||||||
Sources.fetch(local, remote_source)
|
Sources.fetch(local, remote_source)
|
||||||
check_output_mock.assert_has_calls([
|
check_output_mock.assert_has_calls([
|
||||||
MockCall("git", "clone", "--branch", remote_source.branch, "--single-branch",
|
MockCall("git", "clone", "--branch", remote_source.branch, "--single-branch",
|
||||||
remote_source.git_url, str(local), cwd=local, logger=pytest.helpers.anyvar(int)),
|
remote_source.git_url, str(local), logger=pytest.helpers.anyvar(int)),
|
||||||
MockCall("git", "checkout", "--force", remote_source.branch, cwd=local, logger=pytest.helpers.anyvar(int)),
|
MockCall("git", "checkout", "--force", remote_source.branch, cwd=local, logger=pytest.helpers.anyvar(int)),
|
||||||
MockCall("git", "reset", "--hard", f"origin/{remote_source.branch}",
|
MockCall("git", "reset", "--hard", f"origin/{remote_source.branch}",
|
||||||
cwd=local, logger=pytest.helpers.anyvar(int))
|
cwd=local, logger=pytest.helpers.anyvar(int))
|
||||||
|
Reference in New Issue
Block a user