Re: git-dpm breakage src:faker
Brian May <bam@debian.org> writes:
> Hello,
>
> Looks like somebody applied a change to this git-dpm repo that manually
> deleted a patch under debian/patches.
>
> Instead of using "git-dpm checkout-patched" and then updating.
>
> This looks like it has broken git-dpm.
>
> How do I fix?
>
> Guessing I will have to revert the dodgy commit, and then delete the
> patch correctly.
Looks like the damage is more extensive then just one patch:
[brian:~/tree/debian/python-modules/faker] master ± git-dpm status
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
NOT UP TO DATE: 'upstream' is newer than listed in debian/.git-dpm
Could not find '../fake-factory_0.5.7.orig.tar.gz!
Without that file dpkg-source will not work!
(Have you forgotten to run git-dpm prepare?)
git-dpm: WARNING: guessing from your debian/changelog, your upstream file should be named 'faker_0.7.7.orig.tar.*' but it is named 'fake-factory_0.5.7.orig.tar.gz'
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
grep: warning: GREP_OPTIONS is deprecated; please use an alias or script
git-dpm: ERROR: Debian branch contains non-debian changes:
.bumpversion.cfg
.travis.yml
CHANGELOG.rst
CONTRIBUTING.rst
Makefile
README.rst
docs/coding_style.rst
docs/conf.py
docs/index.rst
faker/__init__.py
faker/providers/__init__.py
faker/providers/address/en_AU/__init__.py
faker/providers/address/en_CA/__init__.py
faker/providers/address/en_GB/__init__.py
faker/providers/address/en_US/__init__.py
faker/providers/address/es/__init__.py
faker/providers/address/es_ES/__init__.py
faker/providers/address/es_MX/__init__.py
faker/providers/address/fa_IR/__init__.py
faker/providers/address/fi_FI/__init__.py
faker/providers/address/fr_CH/__init__.py
faker/providers/address/fr_FR/__init__.py
faker/providers/address/hi_IN/__init__.py
faker/providers/address/it_IT/__init__.py
faker/providers/address/ja_JP/__init__.py
faker/providers/address/ko_KR/__init__.py
faker/providers/address/ne_NP/__init__.py
faker/providers/address/nl_BE/__init__.py
faker/providers/address/no_NO/__init__.py
faker/providers/address/pl_PL/__init__.py
faker/providers/address/pt_BR/__init__.py
faker/providers/address/ru_RU/__init__.py
faker/providers/address/sl_SI/__init__.py
faker/providers/address/uk_UA/__init__.py
faker/providers/address/zh_CN/__init__.py
faker/providers/address/zh_TW/__init__.py
faker/providers/barcode/__init__.py
faker/providers/color/__init__.py
faker/providers/color/uk_UA/__init__.py
faker/providers/company/fr_CH/__init__.py
faker/providers/company/pt_BR/__init__.py
faker/providers/company/ru_RU/__init__.py
faker/providers/credit_card/__init__.py
faker/providers/currency/__init__.py
faker/providers/date_time/__init__.py
faker/providers/file/__init__.py
faker/providers/internet/__init__.py
faker/providers/internet/fr_CH/__init__.py
faker/providers/internet/fr_FR/__init__.py
faker/providers/internet/ru_RU/__init__.py
faker/providers/internet/uk_UA/__init__.py
faker/providers/internet/zh_CN/__init__.py
faker/providers/job/__init__.py
faker/providers/job/fr_CH/__init__.py
faker/providers/job/hr_HR/__init__.py
faker/providers/job/zh_TW/__init__.py
faker/providers/misc/__init__.py
faker/providers/person/__init__.py
faker/providers/person/de_AT/__init__.py
faker/providers/person/de_DE/__init__.py
faker/providers/person/dk_DK/__init__.py
faker/providers/person/en/__init__.py
faker/providers/person/en_GB/__init__.py
faker/providers/person/en_US/__init__.py
faker/providers/person/fa_IR/__init__.py
faker/providers/person/fr_CH/__init__.py
faker/providers/person/ko_KR/__init__.py
faker/providers/person/pt_BR/__init__.py
faker/providers/person/ru_RU/__init__.py
faker/providers/person/uk_UA/__init__.py
faker/providers/person/zh_CN/__init__.py
faker/providers/phone_number/en_US/__init__.py
faker/providers/phone_number/fa_IR/__init__.py
faker/providers/phone_number/fr_CH/__init__.py
faker/providers/phone_number/nl_BE/__init__.py
faker/providers/phone_number/zh_TW/__init__.py
faker/providers/profile/__init__.py
faker/providers/python/__init__.py
faker/providers/ssn/__init__.py
faker/providers/ssn/en_CA/__init__.py
faker/providers/ssn/fr_CH/__init__.py
faker/providers/ssn/hr_HR/__init__.py
faker/providers/ssn/ko_KR/__init__.py
faker/providers/ssn/nl_BE/__init__.py
faker/providers/ssn/ru_RU/__init__.py
faker/providers/ssn/sv_SE/__init__.py
faker/providers/ssn/uk_UA/__init__.py
faker/tests/__init__.py
faker/tests/hr_HR/__init__.py
faker/tests/no_NO/__init__.py
faker/tests/pt_BR/__init__.py
faker/utils/datasets.py
readthedocs.yml
setup.py
Can we switch away from git-dpm yet? Sure this is most likely user
error, however I want to try to solve an RC bug, not fix broken git-dpm
first.
In this case I suspect the latest upstream was imported and then the
package renamed without using any of the git-dpm tools or updating
debian/.git-dpm. So I am inclined just to delete debian/.git-dpm in the
interests of getting a fix for the RC bugs as fast as possible.
--
Brian May <bam@debian.org>
Reply to: