]> git.pld-linux.org Git - packages/pyp2rpm.git/blob - no-rpmdev-packager.patch
relup
[packages/pyp2rpm.git] / no-rpmdev-packager.patch
1 diff -urNp -x '*.orig' pyp2rpm-3.3.2.org/pyp2rpm/package_data.py pyp2rpm-3.3.2/pyp2rpm/package_data.py
2 --- pyp2rpm-3.3.2.org/pyp2rpm/package_data.py   2018-03-21 14:54:40.000000000 +0100
3 +++ pyp2rpm-3.3.2/pyp2rpm/package_data.py       2021-03-06 21:01:41.449600641 +0100
4 @@ -2,6 +2,7 @@ import subprocess
5  import time
6  import locale
7  import logging
8 +import os
9  
10  from pyp2rpm import version
11  from pyp2rpm import utils
12 @@ -89,15 +90,9 @@ class PackageData(object):
13      def get_changelog_date_packager(self):
14          """Returns part of the changelog entry, containing date and packager.
15          """
16 -        try:
17 -            packager = subprocess.Popen(
18 -                'rpmdev-packager', stdout=subprocess.PIPE).communicate(
19 -                )[0].strip()
20 -        except OSError:
21 -            # Hi John Doe, you should install rpmdevtools
22 -            packager = "John Doe <john@doe.com>"
23 -            logger.warn("Package rpmdevtools is missing, using default "
24 -                        "name: {0}.".format(packager))
25 +        packager = "John Doe <john@doe.com>"
26 +        if os.has_key('USER'):
27 +            packager = os.environ['USER']
28          with utils.c_time_locale():
29              date_str = time.strftime('%a %b %d %Y', time.gmtime())
30          encoding = locale.getpreferredencoding()
This page took 0.161998 seconds and 4 git commands to generate.