Bug 619935
| Summary: | fedpkg breaks if you forget to push and do a switch-branch | ||
|---|---|---|---|
| Product: | [Fedora] Fedora | Reporter: | Sandro Mathys <sandro> |
| Component: | fedora-packager | Assignee: | David Cantrell <dcantrell> |
| Status: | CLOSED ERRATA | QA Contact: | Fedora Extras Quality Assurance <extras-qa> |
| Severity: | medium | Docs Contact: | |
| Priority: | low | ||
| Version: | 12 | CC: | dcantrell, dennis, lfarkas |
| Target Milestone: | --- | ||
| Target Release: | --- | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Fixed In Version: | fedora-packager-0.5.1.2-2.fc14 | Doc Type: | Bug Fix |
| Doc Text: | Story Points: | --- | |
| Clone Of: | Environment: | ||
| Last Closed: | 2010-08-17 05:36:37 UTC | Type: | --- |
| Regression: | --- | Mount Type: | --- |
| Documentation: | --- | CRM: | |
| Verified Versions: | Category: | --- | |
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
| Cloudforms Team: | --- | Target Upstream Version: | |
| Embargoed: | |||
|
Description
Sandro Mathys
2010-07-30 22:32:46 UTC
I'll take this. We're likely getting an "error" return from git checkout, even though it isn't an error. *sigh* the same happened with me and as i'm not a git expert i can't solve the error:-( I misread what was going on. The core problem here is that you were trying to switch-branch away from a branch that didn't have any spec file in it, and at the time, fedpkg switch-branch depended on being able to "init the module" by reading the spec file and setting various data points. This error message is very confusing, however I believe that in newer versions of fedpkg this error wouldn't happen. python-kitchen-0.2-0.1.a2.el5,fedora-packager-0.5.1.2-1.el5 has been submitted as an update for Fedora EPEL 5. http://admin.fedoraproject.org/updates/python-kitchen-0.2-0.1.a2.el5,fedora-packager-0.5.1.2-1.el5 fedora-packager-0.5.1.2-1.fc14 has been submitted as an update for Fedora 14. http://admin.fedoraproject.org/updates/fedora-packager-0.5.1.2-1.fc14 fedora-packager-0.5.1.2-1.fc13 has been submitted as an update for Fedora 13. http://admin.fedoraproject.org/updates/fedora-packager-0.5.1.2-1.fc13 fedora-packager-0.5.1.2-1.fc12 has been submitted as an update for Fedora 12. http://admin.fedoraproject.org/updates/fedora-packager-0.5.1.2-1.fc12 fedora-packager-0.5.1.2-2.fc13 has been pushed to the Fedora 13 testing repository. If problems still persist, please make note of it in this bug report. If you want to test the update, you can install it with su -c 'yum --enablerepo=updates-testing update fedora-packager'. You can provide feedback for this update here: http://admin.fedoraproject.org/updates/fedora-packager-0.5.1.2-2.fc13 fedora-packager-0.5.1.2-2.el5, python-kitchen-0.2-0.1.a2.el5 has been pushed to the Fedora EPEL 5 testing repository. If problems still persist, please make note of it in this bug report. If you want to test the update, you can install it with su -c 'yum --enablerepo=updates-testing update fedora-packager python-kitchen'. You can provide feedback for this update here: http://admin.fedoraproject.org/updates/python-kitchen-0.2-0.1.a2.el5,fedora-packager-0.5.1.2-2.el5 i still have problems! let's see a simple action. i've the right thing in the master so now i'd like to megre it to all branches: ---------------------------------- [lfarkas@eagle fedora]$ fedpkg clone gstreamer-java Cloning into gstreamer-java... remote: Counting objects: 275, done. remote: Compressing objects: 100% (139/139), done. remote: Total 275 (delta 131), reused 255 (delta 123) Receiving objects: 100% (275/275), 34.95 KiB, done. Resolving deltas: 100% (131/131), done. [lfarkas@eagle fedora]$ cd gstreamer-java [lfarkas@eagle gstreamer-java (master)]$ fedpkg switch-branch f14 Branch f14 set up to track remote branch f14/master from origin. [lfarkas@eagle gstreamer-java (f14)]$ git merge master Updating b610410..bbbdda3 Fast-forward .gitignore | 1 + gstreamer-java-caps.patch | 10 +++++ gstreamer-java-factory.patch | 82 ++++++++++++++++++++++++++++++++++++++++++ gstreamer-java-format.patch | 57 +++++++++++++++++++++++++++++ gstreamer-java.spec | 56 ++++++++++++++++++++-------- sources | 2 +- 6 files changed, 191 insertions(+), 17 deletions(-) create mode 100644 gstreamer-java-caps.patch create mode 100644 gstreamer-java-factory.patch create mode 100644 gstreamer-java-format.patch ---------------------------------- from now on nothing is working: ---------------------------------- [lfarkas@eagle gstreamer-java (f14)]$ fedpkg commit -p # On branch f14 # Your branch is ahead of 'origin/f14/master' by 40 commits. # nothing to commit (working directory clean) Could not commit: Command '['git', 'commit', '-a']' returned non-zero exit status 1 [lfarkas@eagle gstreamer-java (f14)]$ fedpkg commit # On branch f14 # Your branch is ahead of 'origin/f14/master' by 40 commits. # nothing to commit (working directory clean) Could not commit: Command '['git', 'commit', '-a']' returned non-zero exit status 1 [lfarkas@eagle gstreamer-java (f14)]$ git push Everything up-to-date [lfarkas@eagle gstreamer-java (f14)]$ fedpkg build Could not initiate build: There are unpushed changes in your repo ---------------------------------- so what can i do now? have you done the step at the top of http://fedoraproject.org/wiki/Using_Fedora_GIT yes. and have you try my commands? you can do it on the real repo (afaik you're a provenpackager) as i'm the package owner of gstreamer-java you can test it with: --------------------------- fedpkg clone gstreamer-java cd gstreamer-java fedpkg switch-branch f14 git merge master fedpkg commit -p --------------------------- how can you build it in f14? i only got: --------------------------- [lfarkas@eagle gstreamer-java (f14)]$ fedpkg build Could not initiate build: There are unpushed changes in your repo --------------------------- more strange that the remote seems to contains may commit?: http://pkgs.fedoraproject.org/gitweb/?p=gstreamer-java.git;a=shortlog;h=refs/heads/f14/master but not in f13. so you can still test it with f13 branch. [dennis@pegasus fedora]$ cd gstreamer-java [dennis@pegasus gstreamer-java (master)]$ fedpkg switch-branch f14 Branch f14 set up to track remote branch f14/master from origin. [dennis@pegasus gstreamer-java (f14)]$ git merge master Updating b610410..bbbdda3 Fast-forward .gitignore | 1 + gstreamer-java-caps.patch | 10 +++++ gstreamer-java-factory.patch | 82 ++++++++++++++++++++++++++++++++++++++++++ gstreamer-java-format.patch | 57 +++++++++++++++++++++++++++++ gstreamer-java.spec | 56 ++++++++++++++++++++-------- sources | 2 +- 6 files changed, 191 insertions(+), 17 deletions(-) create mode 100644 gstreamer-java-caps.patch create mode 100644 gstreamer-java-factory.patch create mode 100644 gstreamer-java-format.patch [dennis@pegasus gstreamer-java (f14)]$ fedpkg commit -p # On branch f14 # Your branch is ahead of 'origin/f14/master' by 40 commits. # nothing to commit (working directory clean) Could not commit: Command '['git', 'commit', '-a']' returned non-zero exit status 1 [dennis@pegasus gstreamer-java (f14)]$ git push Total 0 (delta 0), reused 0 (delta 0) To ssh://ausil.org/gstreamer-java b610410..bbbdda3 f14 -> f14/master [dennis@pegasus gstreamer-java (f14)]$ fedpkg build --nowait Building gstreamer-java-1.4-4.fc14 for dist-f14-updates-candidate Created task: 2401698 Task info: http://koji.fedoraproject.org/koji/taskinfo?taskID=2401698 you need to "git push" not commit. the changes are commited. just not pushed ok it's working now. but i'm 100% sure i'm already try it also today and it was not working. anyway now it's working thanks. fedora-packager-0.5.1.2-2.fc13 has been pushed to the Fedora 13 stable repository. If problems still persist, please make note of it in this bug report. fedora-packager-0.5.1.2-2.fc12 has been pushed to the Fedora 12 stable repository. If problems still persist, please make note of it in this bug report. fedora-packager-0.5.1.2-2.el5, python-kitchen-0.2-0.1.a2.el5 has been pushed to the Fedora EPEL 5 stable repository. If problems still persist, please make note of it in this bug report. fedora-packager-0.5.1.2-2.fc14 has been pushed to the Fedora 14 stable repository. If problems still persist, please make note of it in this bug report. |