Rename storaged back to udisks #191

martinpitt · 2017-02-03T12:35:49Z

This was done with:

Manually renaming find -iname '*storage*'. Note that we use
udisks2.spec instead of udisks.spec to get back to the previous
package name in Fedora/RHEL.
Automatic mass-renaming with
git ls-tree -r --name-only HEAD|grep -v NEWS | xargs sed -ri
's/storagedtestcase/udiskstestcase/g; s/Storaged([[:alnum:]]*)Test/Udisks\1Test/g;
s/storaged.spec/udisks2.spec/g; s/storaged(_|\b)/udisks\1/g;
s/Storaged/Udisks/g; s/storagectl/udisksctl/g; s/udisks-project/storaged-project/g'

Note that we must not touch the checked STORAGED_* udev properties;
they are already only a fallback for the UDISKS_* properties, and we
should keep them for backwards compatibility with user-created udev
rules for a while. We also keep "storaged-project" as GitHub owner
as that's hard to change and not very visible in releases anyway.
Remove the "is a fork.." message from README.md, and change
top-level project name in NEWS.
Review the remaining potential names and ensure they are unrelated:
git grep -i storage| grep -Evi '(^NEWS|libstoragemgmt|STORAGED_|Rapid Storage|vsphere-50-storage|Apple Core Storage)'

As discussed last week. A make install works and looks plausible, src/tests/integration-test works, and make check succeeds after also applying the fix in PR #190 . The latter also fails its integration tests, and they are not visible to me; I figure this will need some corresponding changes in the test infrastructure and zatana.

vojtechtrefny · 2017-02-03T15:36:16Z

src/tests/dbus-tests/run_tests.py

@@ -48,9 +48,9 @@ def setup_vdevs():
    for d in vdevs:
        with open('/sys/block/%s/device/model' %
                    os.path.basename(d)) as model_file:
-            assert model_file.read().strip() == 'storaged_test_d'
+            assert model_file.read().strip() == 'udisks_test_d'


This should be renamed to "udisks_test_dis". (Model of the targetcli devices is first 15 letters of the disk name.)

Ah, that might explain the odd test failure, thanks! Pushed.

martinpitt · 2017-02-03T16:12:56Z

What the heck, the tests succeeded -- that is a bit of a (positive!) surprise, I would have expected some more fallout ☺

vojtechtrefny

Looks good to me other than the few nitpicks.

We still need to do some packaging, Zanata (translations) and GitHub "magic" before merging this.

vojtechtrefny · 2017-02-06T08:03:41Z

README.md

@@ -1,16 +1,13 @@
-[![build status](https://phatina.fedorapeople.org/jenkins/storaged/build.svg)](https://phatina.fedorapeople.org/jenkins/storaged/build.log)
+[![build status](https://phatina.fedorapeople.org/jenkins/udisks/build.svg)](https://phatina.fedorapeople.org/jenkins/udisks/build.log)


You can delete this. @vpodzime is working on a new way to publish test results.

vojtechtrefny · 2017-02-06T08:05:55Z

packaging/udisks2.spec.in

@@ -335,7 +335,7 @@ systemctl try-restart udisks2
  parted calls

 * Wed Mar 16 2016 Peter Hatina <phatina@redhat.com> - 2.6.0-2


We probably don't want to change the changelog.

vojtechtrefny · 2017-02-06T08:27:35Z

po/da.po

@@ -42,7 +42,7 @@ msgid ""
 "Mount/unmount filesystems defined in the fstab file with the x-udisks-auth "
 "option"
 msgstr ""
-"Monter/afmonter filsystemer defineret i fstab-filen med tilvalget x-storaged-"


We probably should just skip all PO files. PO files are downloaded from Zanata, we should just update the POT file and download new PO files with next release or translation update.

It seems better to me to actually do this. First of all, the current *.po files are wrong: They translate x-udisks-... to x-storaged-..., probably a victim of the earlier rename in the other direction. Second, if we can fix them mechanically I don't see the need of imposing manual labor on translators. And thirdly, as the msgid did not actually change, the POT file will not change either, so this wouldn't even do anything.

However, one instance of translating "Intel Rapid Storaged Technology" crept in, due to the typo (the 'd' should not be there). I'll fix that properly.

I've checked Zanata a there are some new translations (our PO files were downloaded in October) -- I'm not sure how Zanata handles conflicts when uploading new PO files and I really don't want to risk it. I now have admin rights for storaged project in Zanata, so I can fix it manually (it's just 1 string for 6 langugages so it should be easier).

Alright, I'll drop it from the patch then, and just keep the (unrelated) typo fix in de.po.

vojtechtrefny · 2017-02-06T08:38:00Z

src/tests/dbus-tests/run_tests.py

@@ -15,16 +15,16 @@

 def find_daemon(projdir, system):
    if not system:
-        if os.path.exists(os.path.join(projdir, 'src', 'storaged')):


You can just delete this "if". It was just for backwards compatibility when changing from storaged to udisks2 API.

vojtechtrefny · 2017-02-06T08:39:00Z

src/tests/dbus-tests/run_tests.py

        elif os.path.exists(os.path.join(projdir, 'src', 'udisksd')):
            daemon_bin = 'udisksd'
        else:
            print("Cannot find the daemon binary", file=sys.stderr)
            sys.exit(1)
    else:
-        if os.path.exists('/usr/libexec/storaged/storaged'):


vojtechtrefny · 2017-02-06T08:44:49Z

src/tests/dbus-tests/udiskstestcase.py

@@ -139,9 +139,9 @@ def setUpClass(self):
        if daemon_bin == 'udisksd':
            self.iface_prefix = 'org.freedesktop.UDisks2'
            self.path_prefix = '/org/freedesktop/UDisks2'
-        elif daemon_bin == 'storaged':


Same here, you can just remove the storaged "if" here.

vpodzime · 2017-02-06T21:30:56Z

Jenkins, test this, please.

martinpitt · 2017-02-06T21:49:29Z

Force-pushed with addressing @vojtechtrefny 's review comments, thanks!

martinpitt · 2017-02-07T09:00:57Z

@vojtechtrefny: Other than renaming the project on github, is there any other "github magic" to be done here?

tsmetana · 2017-02-07T16:38:03Z

I have no idea for a better place to write this: please don't forget about https://github.com/storaged-project/storaged-project.github.io (and storaged.org). They also deserve to be kept up-to-date.

vojtechtrefny · 2017-02-08T15:20:45Z

@vojtechtrefny: Other than renaming the project on github, is there any other "github magic" to be done here?

I hope not, but I'm pessimist, so I always expect some problems. I'll probably create some new project/repo and try to rename it to see how everything works (especially if the old links still work etc.).

vojtechtrefny

Found two more small things.

vojtechtrefny · 2017-02-09T09:09:03Z

data/.gitignore

-org.storaged.*.policy
+org.udisks.*.conf
+org.udisks.*.service
+org.udisks.*.policy
 *.pc


These should be org.freedesktop.*.

vojtechtrefny · 2017-02-09T09:11:02Z

doc/udisks2-docs.xml.in.in

@@ -9,7 +9,7 @@
    <releaseinfo>
      For version &version; — the latest version of this
      documentation can be found at <ulink role="online-location"
-      url="http://storaged.org/doc/udisks2-api/">http://storaged.org/doc/udisks2-api/</ulink>.
+      url="http://udisks.org/doc/udisks2-api/">http://udisks.org/doc/udisks2-api/</ulink>.


This should be http://storaged.org.

Good catch, thanks. So I suppose I'll change https://udisks.freedesktop.org/docs/latest/ to be a redirect to storaged.org once we deploy this. From an access policy POV this is probably easier.

vojtechtrefny · 2017-02-09T14:25:22Z

I tried to build udisks2 package in Copr and found few more problems in the SPEC file.

Name of the package has to be "udisks2", because we still have udisks package providing the "old" API.
We need to provide/obsolete all the storaged packages.
There was some old description about storaged replacing udisks.

Patch for this is here -- https://vtrefny.fedorapeople.org/patches/storaged-udisks-spec.patch -- and udisks succesfully builds with this in Copr -- https://copr.fedorainfracloud.org/coprs/vtrefny/test/build/509621/

martinpitt · 2017-02-10T07:54:48Z

Thanks @vojtechtrefny! Force-pushed with rebasing against master, resolving the issues you found, and I added your spec file updates.

martinpitt · 2017-02-13T16:44:39Z

Rebased to current master to resolve conflicts.

vpodzime · 2017-02-15T11:32:19Z

This needs one more rebase, sorry. But it looks good to me otherwise, so once rebased, we shall merge this ASAP. :)

This was done with: 1. Manually renaming `find -iname '*storage*'`. Note that we use udisks2.spec instead of udisks.spec to get back to the previous package name in Fedora/RHEL. 2. Automatic mass-renaming with git ls-tree -r --name-only HEAD|grep -v NEWS | xargs sed -ri \ 's/storagedtestcase/udiskstestcase/g; s/Storaged([[:alnum:]]*)Test/Udisks\1Test/g; s/storaged.spec/udisks2.spec/g; s/storaged(_|\b)/udisks\1/g; s/Storaged/Udisks/g; s/storagectl/udisksctl/g; s/udisks-project/storaged-project/g' Note that we must not touch the checked STORAGED_* udev properties; they are already only a fallback for the UDISKS_* properties, and we should keep them for backwards compatibility with user-created udev rules for a while. We also keep "storaged-project" as GitHub owner as that's hard to change and not very visible in releases anyway. 3. Remove the "is a fork.." message from README.md, and change top-level project name in NEWS. 4. Review the remaining potential names and ensure they are unrelated: git grep -i storage| grep -Evi '(^NEWS|libstoragemgmt|STORAGED_|Rapid Storage|vsphere-50-storage|Apple Core Storage)' 5. Fix the expected model file in src/tests/dbus-tests/run_tests.py (first 15 letters of the disk name). 6. Fix the typo in the "Rapid Storaged Technology" in German translations. 7. Various smaller reversions of the above seddery which are unnecessary.

martinpitt · 2017-02-15T12:13:23Z

Rebased.

vpodzime · 2017-02-15T13:59:30Z

Rebased.

Thanks!

martinpitt · 2017-02-15T14:12:41Z

Whee, thanks! And I see you renamed the git project too, and the automatic redirect is working nicely.

vojtechtrefny reviewed Feb 3, 2017

View reviewed changes

vojtechtrefny reviewed Feb 6, 2017

View reviewed changes

vojtechtrefny reviewed Feb 9, 2017

View reviewed changes

martinpitt and others added 2 commits February 15, 2017 13:12

Make Udisks2 provide/obsolete storaged packages

b5b6203

vpodzime merged commit d8ffd86 into storaged-project:master Feb 15, 2017

martinpitt deleted the the-grand-reunion branch February 15, 2017 14:12

		@@ -1,16 +1,13 @@
		[![build status](https://phatina.fedorapeople.org/jenkins/storaged/build.svg)](https://phatina.fedorapeople.org/jenkins/storaged/build.log)
		[![build status](https://phatina.fedorapeople.org/jenkins/udisks/build.svg)](https://phatina.fedorapeople.org/jenkins/udisks/build.log)

		@@ -335,7 +335,7 @@ systemctl try-restart udisks2
		parted calls

		* Wed Mar 16 2016 Peter Hatina <phatina@redhat.com> - 2.6.0-2

Rename storaged back to udisks #191

Rename storaged back to udisks #191

Uh oh!

Conversation

martinpitt commented Feb 3, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

martinpitt commented Feb 3, 2017

Uh oh!

vojtechtrefny left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vpodzime commented Feb 6, 2017

Uh oh!

martinpitt commented Feb 6, 2017

Uh oh!

martinpitt commented Feb 7, 2017

Uh oh!

tsmetana commented Feb 7, 2017

Uh oh!

vojtechtrefny commented Feb 8, 2017

Uh oh!

vojtechtrefny left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vojtechtrefny commented Feb 9, 2017

Uh oh!

martinpitt commented Feb 10, 2017

Uh oh!

martinpitt commented Feb 13, 2017

Uh oh!

vpodzime commented Feb 15, 2017

Uh oh!

martinpitt commented Feb 15, 2017

Uh oh!

vpodzime commented Feb 15, 2017

Uh oh!

martinpitt commented Feb 15, 2017

Uh oh!

Uh oh!

martinpitt commented Feb 3, 2017 •

edited

Loading