]>
Commit | Line | Data |
---|---|---|
58e10a6d ER |
1 | --- pyp2rpm-3.3.0/pyp2rpm/package_data.py~ 2018-02-04 14:48:00.000000000 +0200 |
2 | +++ pyp2rpm-3.3.0/pyp2rpm/package_data.py 2018-02-04 14:49:12.598463752 +0200 | |
52c0e66d | 3 | @@ -2,6 +2,7 @@ |
86badbed ER |
4 | import time |
5 | import locale | |
52c0e66d | 6 | import logging |
86badbed ER |
7 | +import os |
8 | ||
9 | from pyp2rpm import version | |
52c0e66d | 10 | from pyp2rpm import utils |
58e10a6d | 11 | @@ -90,15 +90,9 @@ |
52c0e66d | 12 | def get_changelog_date_packager(self): |
86badbed ER |
13 | """Returns part of the changelog entry, containing date and packager. |
14 | """ | |
52c0e66d ER |
15 | - try: |
16 | - packager = subprocess.Popen( | |
58e10a6d ER |
17 | - 'rpmdev-packager', stdout=subprocess.PIPE).communicate( |
18 | - )[0].strip() | |
52c0e66d ER |
19 | - except OSError: |
20 | - # Hi John Doe, you should install rpmdevtools | |
21 | - packager = "John Doe <john@doe.com>" | |
58e10a6d ER |
22 | - logger.warn("Package rpmdevtools is missing, using default " |
23 | - "name: {0}.".format(packager)) | |
52c0e66d | 24 | + packager = "John Doe <john@doe.com>" |
86badbed ER |
25 | + if os.has_key('USER'): |
26 | + packager = os.environ['USER'] | |
58e10a6d ER |
27 | with utils.c_time_locale(): |
28 | date_str = time.strftime('%a %b %d %Y', time.gmtime()) | |
86badbed | 29 | encoding = locale.getpreferredencoding() |