]>
Commit | Line | Data |
---|---|---|
52c0e66d ER |
1 | --- pyp2rpm-1.1.2/pyp2rpm/package_data.py~ 2014-11-10 11:58:43.000000000 +0200 |
2 | +++ pyp2rpm-1.1.2/pyp2rpm/package_data.py 2015-05-23 13:27:22.354465076 +0300 | |
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 ER |
10 | from pyp2rpm import utils |
11 | @@ -45,14 +46,9 @@ | |
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( | |
17 | - 'rpmdev-packager', stdout=subprocess.PIPE).communicate()[0].strip() | |
18 | - except OSError: | |
19 | - # Hi John Doe, you should install rpmdevtools | |
20 | - packager = "John Doe <john@doe.com>" | |
21 | - logger.warn( | |
22 | - 'Package rpmdevtools is missing, using default name: {0}.'.format(packager)) | |
23 | + packager = "John Doe <john@doe.com>" | |
86badbed ER |
24 | + if os.has_key('USER'): |
25 | + packager = os.environ['USER'] | |
26 | date_str = time.strftime('%a %b %d %Y', time.gmtime()) | |
27 | encoding = locale.getpreferredencoding() | |
52c0e66d | 28 | return u'{0} {1}'.format(date_str, packager.decode(encoding)) |