Note: This is a public test instance of Red Hat Bugzilla. The data contained within is a snapshot of the live data so any changes you make will not be reflected in the production Bugzilla. Email is disabled so feel free to test any aspect of the site that you want. File any problems you find or give feedback at bugzilla.redhat.com.
Bug 625514 - 'make prep' breaks on private branches
Summary: 'make prep' breaks on private branches
Keywords:
Status: CLOSED DUPLICATE of bug 622592
Alias: None
Product: Fedora
Classification: Fedora
Component: fedora-packager
Version: 13
Hardware: All
OS: Linux
low
medium
Target Milestone: ---
Assignee: Dennis Gilmore
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2010-08-19 17:22 UTC by Steve Dickson
Modified: 2013-01-10 06:09 UTC (History)
2 users (show)

Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Clone Of:
Environment:
Last Closed: 2010-08-20 00:50:20 UTC
Type: ---
Embargoed:

Attachments (Terms of Use)

Description Steve Dickson 2010-08-19 17:22:20 UTC 
Description of problem:
fedpkg clone kernel
fedpkg switch-branch f14
git checkout -b pnfs-all-2.6.35-2010-08-05
make prep
fedpkg -v prep --arch=noarch
Creating module object from /Build/steved/fc/git/kernel
Traceback (most recent call last):
  File "/usr/bin/fedpkg", line 1062, in <module>
    args.command(args)
  File "/usr/bin/fedpkg", line 577, in prep
    mymodule = pyfedpkg.PackageModule(args.path)
  File "/usr/lib/python2.6/site-packages/pyfedpkg/__init__.py", line 841, in __init__
    self.branch = self._findbranch()
  File "/usr/lib/python2.6/site-packages/pyfedpkg/__init__.py", line 787, in _findbranch
    merge = self.repo.git.config('--get', 'branch.%s.merge' % localbranch)
  File "/usr/lib/python2.6/site-packages/git/cmd.py", line 127, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/git/cmd.py", line 342, in _call_process
    return self.execute(call, **_kwargs)
  File "/usr/lib/python2.6/site-packages/git/cmd.py", line 249, in execute
    raise GitCommandError(command, status, stderr_value)
git.errors.GitCommandError: 'git config --get branch.pnfs-all-2.6.35-2010-08-05.merge' returned exit status 1: 
make: *** [prep] Error 1

I get the same error with 'fedpkg build'



Version-Release number of selected component (if applicable):


How reproducible:


Steps to Reproduce:
1.
2.
3.
  
Actual results:


Expected results:


Additional info:
Comment 1 Jesse Keating 2010-08-20 00:50:20 UTC 

*** This bug has been marked as a duplicate of bug 622592 ***
Note You need to log in before you can comment on or make changes to this bug.